mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity
28,148 Commits 8 Branches 59 Tags
a23bf8695a6c8ded33f6c2c1fdf67e64ecc0a32c
Commit Graph

219 Commits

Author SHA1 Message Date
Aaron van Geffen
a8267412c2 Move title height helper functions to WindowBase and fix FlexUI plugins 2025-04-11 23:26:34 +02:00
Aaron van Geffen
3f87e2b67a Centralise ResizeFrame in WindowBase and call when setting widgets or resizing 2025-04-11 20:37:54 +02:00
Aaron van Geffen
9a897b9633 Merge pull request #24162 from AaronVanGeffen/draw-fixed-top 
Rework more hardcoded positions to be anchored in widgets
 2025-04-09 18:44:56 +02:00
Michael Steenbeek
cfb4b008b2 Create weak enum for PaletteIndex 2025-04-09 16:47:22 +02:00
Aaron van Geffen
47795f398c Adjust more hardcoded top positions 2025-04-06 11:53:29 +02:00
Gymnasiast
4badffcdb6 Change GameState_t members to lowerCamelCase 2025-03-20 23:05:57 +01:00
Aaron van Geffen
92212369d4 Skip setting page/widgets if we're already on the page (#23975) 2025-03-12 19:50:19 +01:00
Michael Steenbeek
05b64985f4 Update Ride struct to new codestyle 2025-03-09 00:26:25 +01:00
Aaron van Geffen
7a823bf928 Use WindowSetResize to set min/max dimensions in most places (#23929) 
* Refactor WindowSetResize to use ScreenSize structs

* Let WindowSetResize return whether or not window was resized

* Use WindowSetResize to set min/max dimensions in most places
 2025-03-05 15:58:59 +00:00
Aaron van Geffen
a380413c56 Remove Scenario.h include from many units (#23901) 
* Reduce includes/dependencies for Scenario.h

* Remove Scenario.h include from many units
 2025-03-01 17:32:32 +01:00
Michael Steenbeek
9f343abdda Reduce hardcoded positions for various windows 2025-02-26 21:09:54 +01:00
73
b9b2c96c97 Rename sprites.h to SpriteIds.h (#23804) 2025-02-13 15:51:46 +00:00
ζeh Matt
a288d0b912 Fix marketing campaign accessing the widget declaration not instance 2025-01-22 11:41:24 +02:00
Michael Steenbeek
be9f27e4f9 Mass rename constants (#23656) 2025-01-19 15:59:45 +00:00
Aaron van Geffen
5fbe8d0ae1 Centralise external window signatures in Windows.h (#23653) 2025-01-19 15:50:54 +01:00
Aaron van Geffen
bed4d5bdca Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643) 
* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
 2025-01-19 06:58:28 -03:00
Matt
b9f6b6f754 Refactor widgets state (#23621) 
* Refactor windows to not share widget state

* First half of refactoring all the windows

* Refactor the remaining windows, compiles but has issues

* Fix drawing only every second widget

* Remove the need of an terminating widget

* Address WidgetIndex signedness issues; use kWidgetIndexNull more

* Address constexpr issue with Widget content union

* Fix tabs in scenery window

* Fix tabs in object selection window

* Adjust custom widget index for CustomTool events

* Use STR_NONE for default tooltip initialisation

* Adjustment for mingw compiler

* Fix bottom toolbar using the widget declaration not instance

* Remove pointless code in Guest window, handled by SetPage

* Prevent out of bounds crash

* Move scroll widgets initialization to SetPage in Cheats window

* Remove special logic in Options window

* Remove special logic in Park window

* Remove special logic for Player window

* Remove special logic for Research window

* Remove special logic for Ride window

* Remove special logic for Staff window

* Remove special logic for Finances window

* Remove special logic for MapGen window

* Remove special logic for editor objective options window

* Remove special logic for editor scenario options window

* Fix widgets not being set since page is initialized to 0

* Remove more redundant code

* Fix remaining access to widget declarations

* Remove unused variable

* Fix editor object selection tabs on successive windows

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2025-01-18 13:45:17 +01:00
Aaron van Geffen
fa06a49302 Update copyright year to 2025 (#23514) 2024-12-31 20:30:04 +01:00
mrmbernardi
ddfb644c61 Fix typo in finance graph max size (#23437) 
* Fix typo in finance graph max size

* Remove dead code
 2024-12-20 04:17:29 +11:00
Michael Bernardi
e7ca356633 Replace big window size limits with int16_t max. 2024-12-10 02:09:05 +11:00
Michael Bernardi
611cc35fc4 Add resize and tooltips to park graphs 
# Conflicts:
#	src/openrct2-ui/interface/Graph.cpp
 2024-09-27 04:32:33 +10:00
Aaron van Geffen
b971d1596e Indent window widget definitions (#22700) 
* Indent definitions in About, AssetPacks windows

* Indent definitions in Banner, Changelog, CustomCurrency windows

* Indent DebugPaint, DemolishRidePrompt windows

* Indent EditorBottomToolbar, EditorInventionsList

* Indent EditorObjectiveOptions, EditorScenarioOptions

* Indent Finances

* Indent Footpath

* Indent GameBottomToolbar

* Indent Guest window

* Indent GuestList, InstallTrack windows

* Indent Land, LandRights windows

* Indent LoadSave, Main, MapGen, MapTooltip windows

* Indent MazeConstruction

* Indent Multiplayer

* Indent NetworkStatus

* Indent NewCampaign

* Indent NewRide window

* Indent News window

* Indent NewsOptions window

* Indent ObjectLoadError window

* Indent Options window

* Indent Park window

* Indent PatrolArea window

* Indent Player window

* Indent RefurbishRidePrompt window

* Indent Research window

* Indent Ride window

* Indent RideConstruction

* Indent RideList

* Indent SavePrompt

* Indent ScenarioSelect widgets

* Indent scenario window

* Indent scenery scatter window defs

* Indent server list window

* Indent server start window§

* Indent ShortcutKeys window

* Indent Sign window

* Indent Staff window

* Indent StaffFirePrompt window

* Indent StaffList window defs

* Indent Themes window defs

* Indent TileInspector window defs

* Indent TitleExit, TitleMenu, TitleOptions, Tooltip windows

* Indent TrackDesignManage window defs

* Indent TrackDesignPlace defs

* Indent TrackList def

* Indent Transparency window defs

* Indent ViewClipping window defs

* Indent Viewport window defs

* Indent Water window defs
 2024-09-04 21:11:26 +02:00
Harry Hopkinson
c1ac7c0700 Cleanup gameState usage 2024-09-02 22:42:37 +02:00
mrmbernardi
e8f3d690df Fix Y axis label tick marks on park and finance graphs. (#22580) 
Also adds variable padding to park graph Y axis labels.
 2024-08-18 22:24:29 +10:00
Aaron van Geffen
aa7eb18d78 Rename ScrollBar struct to ScrollArea and rename its properties (#22539) 2024-08-11 16:21:53 +02:00
mrmbernardi
c7159aa81e Variable padding for finance graph Y axis labels (#22498) 
Also fixes overflows during plotting
 2024-08-11 11:35:00 +02:00
mrmbernardi
9f0125b509 Fix finance graph maximum finding algorithm. (#22488) 2024-08-06 02:29:21 +10:00
Michael Bernardi
5742577c95 New Y axis label algorithm for finance graphs. 2024-08-05 15:37:22 +10:00
Michael Bernardi
82f658963f Improve readability of hover tooltip 
Also removed reliance on the localisation table.
 2024-08-05 15:37:22 +10:00
Michael Bernardi
f4a1d22662 Draw park graphs with new method. 
Also clean up constants and includes.
 2024-08-05 15:37:21 +10:00
Michael Bernardi
9e2eb73aa7 Extract window specific logic from Graph.cpp 2024-08-05 15:37:21 +10:00
Michael Bernardi
56dd6c9bdf Refactor finance graphs in Graph.cpp 2024-08-05 15:37:21 +10:00
Michael Bernardi
713858bba3 Refactor Finances.cpp graphs 2024-08-05 15:37:21 +10:00
Aaron van Geffen
3d5c19de08 Drop Localisation.h include where not required 2024-07-13 13:33:32 +02:00
Aaron van Geffen
8134ca069a Move kMarketingCampaignNames to Marketing unit 2024-07-12 23:56:22 +02:00
Aaron van Geffen
3fd91038c3 Rename Date.h to Localisation.Date.h to match unit file 2024-07-12 22:18:43 +02:00
Gymnasiast
8a181b5513 Split colours and colour flags 2024-05-26 12:35:40 +02:00
Harry Hopkinson
ef8618209e Move gMarketingCampaigns to GameState_t 2024-05-17 21:20:27 +02:00
Claudio Tiecher
10a5d790c6 Part of #21421: replace define with constexpr (#21760) 
* Part of #21421: refactor TUNNEL_MAX_COUNT

* Part of #21421: deleted unused OBJECT_SELECTION_NOT_...

* Part of #21421: refactor MAX_SERVER_DESCRIPTION_LENGTH

* Part of #21421: refactor EXPENDITURE_TABLE_MONTH_COUNT

* Part of #21421: refactor FINANCE_GRAPH_SIZE

* Part of #21421: refactor NETWORK_STREAM_VERSION and _ID

* Part of #21421: MONEY_STRING_MAXLENGTH

* Part of #21421: deleted MAX_USER_STRINGS

* Part of #21421: refactor USER_STRING_MAX_LENGTH

* Part of #21421: deleted USER_STRING_END

* Part of #21421: refactor REAL_NAME_START

* Part of #21421: refactor REAL_NAME_END

* Part of #21421: deleted FONT(X) and FONT_OPENRCT2_SPRITE

* Part of #21421: refactor CURRENCY_SYMBOL_MAX_SIZE

* Part of #21421: refactor CURRENCY_RATE_MAX_NUM_DIGITS

* Part of #21421: refactor SCROLLABLE_ROW_HEIGHT

* Part of #21421: refactor ADD_CLAMP_BODY

* Part of #21421: applied clang-format to Util.cpp

* Part of #21421: incorporate feedback from #21760

* Part of #21421: revert to nbsp in Currency.cpp

* Part of #21421: fix merge conflict

* Part of #21421: fix more merge conflict

* Part of #21421: apply clang format

* Part of #21421: using std::numerics for finding bounds

* Part of #21421: fix reference to kAddClampBody

* Part of #21421: improved on comments about AddClamp func

* Part of #21421: apply correct network stream version number

* Part of #21421: apply clang-format
 2024-05-09 08:59:03 -03:00
Aaron van Geffen
ca6f142a97 Remove Config.h include from many places 2024-05-08 22:29:32 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
Harry-Hopkinson
9fa917ae57 Rename SPINNER_HEIGHT to kSpinnerHeight 2024-04-14 16:56:33 +00:00
Harry-Hopkinson
14cdfc7262 Rename BUTTON_FACE_HEIGHT to kButtonFaceHeight 2024-04-14 16:44:39 +00:00
Harry-Hopkinson
2ccb77320b Rename TABLE_CELL_HEIGHT to kTableCellHeight 2024-04-14 16:41:01 +00:00
Harry-Hopkinson
f242bbf095 Rename LIST_ROW_HEIGHT to kListRowHeight 2024-04-14 16:37:01 +00:00
Gymnasiast
c158854a7f Move Park into namespace, add other park-related things to struct 2024-04-04 18:14:27 +02:00
Gymnasiast
4f3b7aa8a9 Turn Park into struct 2024-04-04 18:12:36 +02:00
Gymnasiast
28451027b1 Move Park to GameState_t 2024-04-04 18:12:08 +02:00
CoryY
3f81a491b0 Close #21569: Remove 'Window' from Window Open function names (#21613) 
* Close #21569: Remove 'Window' from Window Open function names

Windows are all under the OpenRCT2::Ui::Windows namespace. As such, "Window" is removed from the Open functions names.

* Update Contributors.md

* Fix formatting TrackMangeOpen

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* Fix formatting TrackPlaceOpen

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

---------

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-03-17 06:37:46 +00:00
Duncan
7a60e7f2e0 OpenRCT2::Ui::Windows namespace for OpenRCT2 Ui Windows (#21559) 
* Move all the windows into OpenRCT2::Ui::Windows namespace

* Fix missing symbol

* Clang format

* Call the correct FormatStringID
 2024-03-10 13:52:35 +00:00