3a82c97aa1
Merge remote-tracking branch 'upstream/master'
2021-01-25 00:50:42 +02:00
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
2021-01-08 11:16:18 +01:00
0c5dc5d41e
Change: [Linkgraph] Pause the game when linkgraph jobs lag ( #6470 )
...
Check if the job is still running two date fract ticks before it is due
to join, and if so pause the game until its done.
When loading a game, check if the game would block immediately due to
a job which is scheduled to be joined within two date fract ticks,
and if so pause the game until its done.
This avoids the main thread being blocked on a thread join, which appears
to the user as if the game is unresponsive, as the UI does not repaint
and cannot be interacted with.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
2020-12-22 15:17:57 +01:00
26b91192a3
Feature: Center text and icons in the status bar vertically ( #8273 )
2020-07-15 16:57:31 +02:00
798fbc3466
Merge branch 'origin/master' commit 'a499e9acdd385b57dd43caf88af3a6f7f53716ba'
2020-03-20 00:10:46 +02:00
3a14cea068
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
2019-12-21 20:13:03 +01:00
13cc8a0cee
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
afbf6a5918
Feature: Allow showing Newspaper and Ticker messages in parallel
2019-08-03 10:28:13 +01:00
2c67af391b
Fix: Scale news ticker scroll speed by UI scale
2019-04-24 23:04:55 +02:00
3ba683874b
Merge remote-tracking branch 'origin/master' into HEAD
2019-04-23 18:16:24 +03:00
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
317f69c152
Codechange: Use override specifier in Window-derived classes.
2019-03-24 16:10:04 +01:00
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
2019-01-11 11:56:21 +00:00
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
2019-01-11 11:56:21 +00:00
35d1878dd9
More Android patches reverted
2018-05-31 22:09:18 +03:00
3f4beeb212
Fixed text input widget too small and bottom bar too wide
2016-04-03 00:57:18 +03:00
7dc511ba5c
Fixed toolbar and status bar
2016-03-27 22:45:58 +03:00
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
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
e113f5e4a1
(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
91ebce1a9c
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/console_gui.cpp
src/genworld_gui.cpp
src/group_gui.cpp
src/misc_gui.cpp
src/settings_gui.cpp
src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
2014-04-23 20:13:33 +00:00
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
2014-04-23 20:13:33 +00:00
fd9b7efa97
Amend some widgets properties for high resolution screens.
2014-03-15 21:37:18 +02:00
cab76bd7af
Draw strings vertically aligned on some windows.
2014-03-15 21:34:36 +02:00
c715c1073a
Get better sizes for widgets of statusbar.
2014-03-15 21:33:24 +02:00
1dbcfe02f5
Reorder DrawWidget on StatusBarWindow.
2014-03-15 21:33:24 +02:00
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
2013-05-26 19:25:01 +00:00
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
2013-05-26 19:25:01 +00:00
aecb5c30ed
(svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc.
2013-05-26 19:24:37 +00:00
8c4714ad90
(svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc.
2013-05-26 19:24:37 +00:00
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
2013-05-26 19:23:42 +00:00
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
2013-05-26 19:23:42 +00:00
eb20798aae
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
2012-12-08 17:18:51 +00:00
b533523258
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
2012-12-08 17:18:51 +00:00
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
2012-11-11 16:10:43 +00:00
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
2012-11-11 16:10:43 +00:00
e054cd36b9
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:21:13 +00:00
e2726ca3f1
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:21:13 +00:00
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00
da63ce43fa
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
2011-12-15 19:54:23 +00:00
df0afdf0dc
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
2011-12-15 19:54:23 +00:00
7196157d2d
(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)
2011-09-15 13:26:27 +00:00
ad232bd497
(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)
2011-09-15 13:26:27 +00:00
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
2011-05-01 19:51:52 +00:00
5a620d1c65
(svn r22406) -Document: some more "random-ish" tidbits
2011-05-01 19:51:52 +00:00
4b4a40a72e
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
2011-03-13 21:31:29 +00:00
ec9540a12a
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
2011-03-13 21:31:29 +00:00
1a9ae166eb
(svn r21955) -Cleanup: always show the long date in the status bar
2011-02-04 14:38:15 +00:00
pelya