mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23532) -Codechange: unify widget naming of (extra) viewport

release/1.2
rubidium 2011-12-16 16:29:53 +00:00
parent e9f584ac21
commit b6a303387c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/viewport_gui.cpp
View File

@ -26,20 +26,20 @@
static const NWidgetPart _nested_extra_view_port_widgets[] = { static const NWidgetPart _nested_extra_view_port_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, EVW_CAPTION), SetDataTip(STR_EXTRA_VIEW_PORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), SetDataTip(STR_EXTRA_VIEW_PORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY), NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(NWID_VIEWPORT, INVALID_COLOUR, EVW_VIEWPORT), SetPadding(2, 2, 2, 2), SetResize(1, 1), SetFill(1, 1), NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_EV_VIEWPORT), SetPadding(2, 2, 2, 2), SetResize(1, 1), SetFill(1, 1),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, EVW_ZOOMIN), SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_IN), SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, EVW_ZOOMOUT), SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_OUT), SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, EVW_MAIN_TO_VIEW), SetFill(1, 1), SetResize(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_MAIN_TO_VIEW), SetFill(1, 1), SetResize(1, 0),
SetDataTip(STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT), SetDataTip(STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, EVW_VIEW_TO_MAIN), SetFill(1, 1), SetResize(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_VIEW_TO_MAIN), SetFill(1, 1), SetResize(1, 0),
SetDataTip(STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT), SetDataTip(STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
@ -55,9 +55,9 @@ public:
{ {
this->InitNested(desc, window_number); this->InitNested(desc, window_number);
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(EVW_VIEWPORT); NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_EV_VIEWPORT);
nvp->InitializeViewport(this, 0, ZOOM_LVL_VIEWPORT); nvp->InitializeViewport(this, 0, ZOOM_LVL_VIEWPORT);
if (_settings_client.gui.zoom_min == ZOOM_LVL_VIEWPORT) this->DisableWidget(EVW_ZOOMIN); if (_settings_client.gui.zoom_min == ZOOM_LVL_VIEWPORT) this->DisableWidget(WID_EV_ZOOM_IN);
Point pt; Point pt;
if (tile == INVALID_TILE) { if (tile == INVALID_TILE) {
@ -80,7 +80,7 @@ public:
virtual void SetStringParameters(int widget) const virtual void SetStringParameters(int widget) const
{ {
switch (widget) { switch (widget) {
case EVW_CAPTION: case WID_EV_CAPTION:
/* set the number in the title bar */ /* set the number in the title bar */
SetDParam(0, this->window_number + 1); SetDParam(0, this->window_number + 1);
break; break;
@ -90,10 +90,10 @@ public:
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
switch (widget) { switch (widget) {
case EVW_ZOOMIN: DoZoomInOutWindow(ZOOM_IN, this); break; case WID_EV_ZOOM_IN: DoZoomInOutWindow(ZOOM_IN, this); break;
case EVW_ZOOMOUT: DoZoomInOutWindow(ZOOM_OUT, this); break; case WID_EV_ZOOM_OUT: DoZoomInOutWindow(ZOOM_OUT, this); break;
case EVW_MAIN_TO_VIEW: { // location button (move main view to same spot as this view) 'Paste Location' case WID_EV_MAIN_TO_VIEW: { // location button (move main view to same spot as this view) 'Paste Location'
Window *w = FindWindowById(WC_MAIN_WINDOW, 0); Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
int x = this->viewport->scrollpos_x; // Where is the main looking at int x = this->viewport->scrollpos_x; // Where is the main looking at
int y = this->viewport->scrollpos_y; int y = this->viewport->scrollpos_y;
@ -105,7 +105,7 @@ public:
break; break;
} }
case EVW_VIEW_TO_MAIN: { // inverse location button (move this view to same spot as main view) 'Copy Location' case WID_EV_VIEW_TO_MAIN: { // inverse location button (move this view to same spot as main view) 'Copy Location'
const Window *w = FindWindowById(WC_MAIN_WINDOW, 0); const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
int x = w->viewport->scrollpos_x; int x = w->viewport->scrollpos_x;
int y = w->viewport->scrollpos_y; int y = w->viewport->scrollpos_y;
@ -120,7 +120,7 @@ public:
virtual void OnResize() virtual void OnResize()
{ {
if (this->viewport != NULL) { if (this->viewport != NULL) {
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(EVW_VIEWPORT); NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_EV_VIEWPORT);
nvp->UpdateViewportCoordinates(this); nvp->UpdateViewportCoordinates(this);
} }
} }
@ -149,7 +149,7 @@ public:
{ {
if (!gui_scope) return; if (!gui_scope) return;
/* Only handle zoom message if intended for us (msg ZOOM_IN/ZOOM_OUT) */ /* Only handle zoom message if intended for us (msg ZOOM_IN/ZOOM_OUT) */
HandleZoomMessage(this, this->viewport, EVW_ZOOMIN, EVW_ZOOMOUT); HandleZoomMessage(this, this->viewport, WID_EV_ZOOM_IN, WID_EV_ZOOM_OUT);
} }
}; };

14
src/widgets/viewport_widget.h
View File

@ -13,13 +13,13 @@
#define WIDGETS_VIEWPORT_WIDGET_H #define WIDGETS_VIEWPORT_WIDGET_H
/** Widgets of the WC_EXTRA_VIEW_PORT. */ /** Widgets of the WC_EXTRA_VIEW_PORT. */
enum ExtraViewportWindowWidgets { enum ExtraViewportWidgets {
EVW_CAPTION, WID_EV_CAPTION, ///< Caption of window.
EVW_VIEWPORT, WID_EV_VIEWPORT, ///< The viewport.
EVW_ZOOMIN, WID_EV_ZOOM_IN, ///< Zoom in.
EVW_ZOOMOUT, WID_EV_ZOOM_OUT, ///< Zoom out.
EVW_MAIN_TO_VIEW, WID_EV_MAIN_TO_VIEW, ///< Center the view of this viewport on the main view.
EVW_VIEW_TO_MAIN, WID_EV_VIEW_TO_MAIN, ///< Center the main view on the view of this viewport.
}; };
#endif /* WIDGETS_VIEWPORT_WIDGET_H */ #endif /* WIDGETS_VIEWPORT_WIDGET_H */