cpp/openttd-patchpack/source Changeset - r15781:98918f8b75ee

Changeset - r15781:98918f8b75ee

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 14 years ago 2010-08-12 11:53:11
frosch@openttd.org

(svn r20466) -Codechange: USe NWID_SELECTION to hide the scrollbar in dropdowns.

1 file changed with 9 insertions and 8 deletions:

src/widgets/dropdown.cpp

0 comments (0 inline, 0 general)

src/widgets/dropdown.cpp

➞

Show inline comments

@@ @@ -69,14 +69,17 @@ static void DeleteDropDownList(DropDownL @@
 /** Widget numbers of the dropdown menu. */
 enum DropdownMenuWidgets {
 	DDM_ITEMS,  ///< Panel showing the dropdown items.
 	DDM_SCROLL, ///< Scrollbar.
 	DDM_ITEMS,        ///< Panel showing the dropdown items.
 	DDM_SHOW_SCROLL,  ///< Hide scrollbar if too few items.
 	DDM_SCROLL,       ///< Scrollbar.
 };
 static const NWidgetPart _nested_dropdown_menu_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_END, DDM_ITEMS), SetMinimalSize(1, 1), SetScrollbar(DDM_SCROLL), EndContainer(),
 		NWidget(NWID_VSCROLLBAR, COLOUR_END, DDM_SCROLL),
 		NWidget(NWID_SELECTION, INVALID_COLOUR, DDM_SHOW_SCROLL),
 			NWidget(NWID_VSCROLLBAR, COLOUR_END, DDM_SCROLL),
 		EndContainer(),
 	EndContainer(),
 };
@@ @@ -128,11 +131,9 @@ struct DropdownWindow : Window { @@
 		nwi->colour = wi_colour;
 		nwi = this->GetWidget<NWidgetCore>(DDM_SCROLL);
 		if (scroll) {
 			nwi->colour = wi_colour;
 		} else {
 			nwi->min_x = 0; // Make scrollbar invisible.
+		}
 		nwi->colour = wi_colour;
 		this->GetWidget<NWidgetStacked>(DDM_SHOW_SCROLL)->SetDisplayedPlane(scroll ? 0 : SZSP_NONE);
 		this->FinishInitNested(&_dropdown_desc, 0);
 		this->flags4 &= ~WF_WHITE_BORDER_MASK;

0 comments (0 inline, 0 general)