Commit Graph

14 Commits

Author SHA1 Message Date
pelya
3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
frosch
abe22e594d (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 2015-02-13 21:13:45 +00:00
Sergii Pylypenko
3cb6c7d5ee Fixed right toolbar moving to the left, removed remainder of 'touchscreen mode' stuff 2014-06-03 21:55:41 +03:00
Sergii Pylypenko
7e6e95c34c Some fixes to window placement 2014-06-02 23:25:47 +03:00
Juanjo
06a276e5ad Add a window for touchscreen devices. 2014-03-15 22:23:22 +02:00
frosch
aecb5c30ed (svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc. 2013-05-26 19:24:37 +00:00
rubidium
484dab34c9 (svn r24065) -Feature-ish [FS#5101]: debug option for showing the redrawn dirty blocks/rectangles 2012-03-25 19:06:59 +00:00
planetmaker
cc68dac035 (svn r22675) -Change: Add a menu entry for the sprite bounding box debuging feature in the help menu and enable bounding boxes only in conjunction with the newgrf developer tools 2011-07-20 16:19:48 +00:00
yexo
fee8c84de9 (svn r20807) -Codechange: don't clamp the width of the main toolbar to 640 pixels 2010-09-15 21:10:14 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
c3e87f345d (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too 2009-03-15 00:32:18 +00:00
rubidium
d87fc4d534 (svn r13106) -Codechange: rework the toolbar code a little so functions do not have to return the Window they just created. 2008-05-15 19:00:20 +00:00
rubidium
bc37ae3f2a (svn r12767) -Codechange: merge all main toolbar related functions into a single file instead of scattering the functionality over several files. 2008-04-18 15:11:39 +00:00
rubidium
672087ecf6 (svn r12398) -Codechange [FS#1770]: Move toolbar related code to it's own little neighbourhood. Based on a patch by Dominik. 2008-03-23 07:35:29 +00:00