Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml +++ ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml @@ -76,7 +76,7 @@ sprite2_disabled="ModernDropDownArrowDisabled" sprite2_pressed="ModernDropDownArrowHighlight" buffer_zone="8" - dropdown_size="224" + dropdown_size="225" sprite_list="BlackBorderOnGray" sprite_selectarea="ModernDarkBoxWhite" textcolor_selected="white" Index: ps/trunk/source/gui/CDropDown.cpp =================================================================== --- ps/trunk/source/gui/CDropDown.cpp +++ ps/trunk/source/gui/CDropDown.cpp @@ -393,7 +393,7 @@ GUI::GetSetting(this, "dropdown_size", size); GUI::GetSetting(this, "dropdown_buffer", buffer); - if (m_ItemsYPositions.empty() || m_ItemsYPositions.back() >= size) + if (m_ItemsYPositions.empty() || m_ItemsYPositions.back() > size) { m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+buffer, m_CachedActualSize.right, m_CachedActualSize.bottom+buffer + size); Index: ps/trunk/source/gui/IGUIScrollBar.h =================================================================== --- ps/trunk/source/gui/IGUIScrollBar.h +++ ps/trunk/source/gui/IGUIScrollBar.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -207,12 +207,12 @@ /** * Get the value of m_Pos that corresponds to the bottom of the scrollable region */ - float GetMaxPos() const { return std::max(1.f, m_ScrollRange - m_ScrollSpace); } + float GetMaxPos() const { return std::max(0.f, m_ScrollRange - m_ScrollSpace); } /** - * Get the value of m_Pos that corresponds to the bottom of the scrollable region + * Scrollbars without height shouldn't be visible */ - float IsVisible() const { return GetMaxPos() != 1.f; } + bool IsVisible() const { return GetMaxPos() != 0.f; } /** * Increase scroll one step