diff options
| author | frosch <frosch@openttd.org> | 2013-06-30 14:36:31 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-06-30 14:36:31 +0000 |
| commit | 43ec0bf0c118b5228a9c50a2ba1650d021dc5c44 (patch) | |
| tree | 5aef49476d90a8b682f809125c8c37d035a1c9fa /src/group_gui.cpp | |
| parent | 8116aeff218fe55c98c0dcd2a62390fe7e7d9c6e (diff) | |
| download | openttd-43ec0bf0c118b5228a9c50a2ba1650d021dc5c44.tar.xz | |
(svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size.
Diffstat (limited to 'src/group_gui.cpp')
| -rw-r--r-- | src/group_gui.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 8c1859764..ed3176e27 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -47,7 +47,7 @@ static const NWidgetPart _nested_group_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY, WID_GL_ALL_VEHICLES), SetFill(1, 0), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_GL_DEFAULT_VEHICLES), SetFill(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_MATRIX, COLOUR_GREY, WID_GL_LIST_GROUP), SetMatrixDataTip(1, 7, STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP), + NWidget(WWT_MATRIX, COLOUR_GREY, WID_GL_LIST_GROUP), SetMatrixDataTip(1, 0, STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP), SetFill(1, 0), SetResize(0, 1), SetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR), NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_GL_LIST_GROUP_SCROLLBAR), EndContainer(), @@ -71,7 +71,7 @@ static const NWidgetPart _nested_group_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetResize(1, 0), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_MATRIX, COLOUR_GREY, WID_GL_LIST_VEHICLE), SetMinimalSize(248, 0), SetMatrixDataTip(1, 7, STR_NULL), SetResize(1, 1), SetFill(1, 0), SetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR), + NWidget(WWT_MATRIX, COLOUR_GREY, WID_GL_LIST_VEHICLE), SetMinimalSize(248, 0), SetMatrixDataTip(1, 0, STR_NULL), SetResize(1, 1), SetFill(1, 0), SetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR), NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_GL_LIST_VEHICLE_SCROLLBAR), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(1, 0), SetFill(1, 1), SetResize(1, 0), EndContainer(), @@ -679,13 +679,8 @@ public: virtual void OnResize() { - NWidgetCore *nwi = this->GetWidget<NWidgetCore>(WID_GL_LIST_GROUP); this->group_sb->SetCapacityFromWidget(this, WID_GL_LIST_GROUP); - nwi->widget_data = (this->group_sb->GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START); - - nwi = this->GetWidget<NWidgetCore>(WID_GL_LIST_VEHICLE); this->vscroll->SetCapacityFromWidget(this, WID_GL_LIST_VEHICLE); - nwi->widget_data = (this->vscroll->GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START); } virtual void OnDropdownSelect(int widget, int index) |