diff options
| author | frosch <frosch@openttd.org> | 2015-02-01 20:54:24 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2015-02-01 20:54:24 +0000 |
| commit | a8080b62563dcb9f3e3bf5180ebf2de6cf6b68ae (patch) | |
| tree | 3ac628ab264823257073f281ce7e692f07e5c651 /src/road_gui.cpp | |
| parent | 3bc7ee3ab731c7a855f811b36356ed907b42989a (diff) | |
| download | openttd-a8080b62563dcb9f3e3bf5180ebf2de6cf6b68ae.tar.xz | |
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
Diffstat (limited to 'src/road_gui.cpp')
| -rw-r--r-- | src/road_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 6b23ca631..09b76a533 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -867,15 +867,15 @@ struct BuildRoadDepotWindow : public PickerWindowBase { { if (!IsInsideMM(widget, WID_BROD_DEPOT_NE, WID_BROD_DEPOT_NW + 1)) return; - size->width = UnScaleByZoom(64 * 4, ZOOM_LVL_GUI) + 2; - size->height = UnScaleByZoom(48 * 4, ZOOM_LVL_GUI) + 2; + size->width = ScaleGUITrad(64) + 2; + size->height = ScaleGUITrad(48) + 2; } virtual void DrawWidget(const Rect &r, int widget) const { if (!IsInsideMM(widget, WID_BROD_DEPOT_NE, WID_BROD_DEPOT_NW + 1)) return; - DrawRoadDepotSprite(r.left + 1 + UnScaleByZoom(31 * 4, ZOOM_LVL_GUI), r.bottom - UnScaleByZoom(31 * 4, ZOOM_LVL_GUI), (DiagDirection)(widget - WID_BROD_DEPOT_NE + DIAGDIR_NE), _cur_roadtype); + DrawRoadDepotSprite(r.left + 1 + ScaleGUITrad(31), r.bottom - ScaleGUITrad(31), (DiagDirection)(widget - WID_BROD_DEPOT_NE + DIAGDIR_NE), _cur_roadtype); } virtual void OnClick(Point pt, int widget, int click_count) @@ -1003,8 +1003,8 @@ struct BuildRoadStationWindow : public PickerWindowBase { { if (!IsInsideMM(widget, WID_BROS_STATION_NE, WID_BROS_STATION_Y + 1)) return; - size->width = UnScaleByZoom(64 * 4, ZOOM_LVL_GUI) + 2; - size->height = UnScaleByZoom(48 * 4, ZOOM_LVL_GUI) + 2; + size->width = ScaleGUITrad(64) + 2; + size->height = ScaleGUITrad(48) + 2; } virtual void DrawWidget(const Rect &r, int widget) const @@ -1012,7 +1012,7 @@ struct BuildRoadStationWindow : public PickerWindowBase { if (!IsInsideMM(widget, WID_BROS_STATION_NE, WID_BROS_STATION_Y + 1)) return; StationType st = (this->window_class == WC_BUS_STATION) ? STATION_BUS : STATION_TRUCK; - StationPickerDrawSprite(r.left + 1 + UnScaleByZoom(31 * 4, ZOOM_LVL_GUI), r.bottom - UnScaleByZoom(31 * 4, ZOOM_LVL_GUI), st, INVALID_RAILTYPE, widget < WID_BROS_STATION_X ? ROADTYPE_ROAD : _cur_roadtype, widget - WID_BROS_STATION_NE); + StationPickerDrawSprite(r.left + 1 + ScaleGUITrad(31), r.bottom - ScaleGUITrad(31), st, INVALID_RAILTYPE, widget < WID_BROS_STATION_X ? ROADTYPE_ROAD : _cur_roadtype, widget - WID_BROS_STATION_NE); } virtual void OnClick(Point pt, int widget, int click_count) |