miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed right toolbar moving to the left, removed remainder of 'touchscreen mode' stuff

Browse Source
This commit is contained in:
Sergii Pylypenko
2014-06-03 21:55:41 +03:00
parent 75c376a23e
commit 3cb6c7d5ee
6 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/window.cpp
View File

@@ -3449,7 +3449,7 @@ static int PositionWindow(Window *w, WindowClass clss, int setting)
*/
int PositionMainToolbar(Window *w)
{
if (_settings_client.gui.vertical_toolbar) return 0;
if (_settings_client.gui.vertical_toolbar) return 0; /* Always at the left */
DEBUG(misc, 5, "Repositioning Main Toolbar...");
return PositionWindow(w, WC_MAIN_TOOLBAR, _settings_client.gui.toolbar_pos);
}
@@ -3525,13 +3525,19 @@ void RelocateAllWindows(int neww, int newh)
continue;
case WC_MAIN_TOOLBAR:
case WC_MAIN_TOOLBAR_RIGHT:
ResizeWindow(w, min(neww, w->window_desc->default_width) - w->width, 0, false);
top = w->top;
left = PositionMainToolbar(w); // changes toolbar orientation
break;
case WC_MAIN_TOOLBAR_RIGHT:
ResizeWindow(w, min(neww, w->window_desc->default_width) - w->width, 0, false);
top = w->top;
left = neww - w->width;
break;
case WC_NEWS_WINDOW:
top = newh - w->height;
left = PositionNewsMessage(w);