1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Commit Graph

262 Commits

Author SHA1 Message Date
Michael Steenbeek
7b322d825a Refactor constants in window .cpp files 2025-06-16 23:10:47 +02:00
Gymnasiast
81e3181ebb Pass ScreenSize to makeWindowShim() 2025-06-10 23:21:15 +02:00
Gymnasiast
bdba89f428 Pass ScreenSize to window creation functions 2025-06-10 23:20:28 +02:00
Gymnasiast
bd6ae5848c Rename remaining methods in Widget.h to lowerCamelCase 2025-06-10 23:20:18 +02:00
Gymnasiast
650fa3ae2e Rename WindowWidgetType to WidgetType and change for new code style 2025-06-10 19:55:12 +02:00
Gymnasiast
149468406b Update WindowColour enum for new code style 2025-06-10 19:53:12 +02:00
Gymnasiast
86e265f093 Make widget creation functions lowerCamelCase 2025-06-10 19:51:21 +02:00
Aaron van Geffen
0779b9f0ab Replace window shim and widget macros with constexpr functions (#24566) 2025-06-07 23:02:14 +02:00
mix
0b5fb11be9 Remove unnecessary window OnResize calls 2025-05-22 20:58:54 +01:00
Matt
6335c31336 Rename DrawPixelInfo to RenderTarget (#24339)
* Begin backend separation, rename type DrawingPixelInfo to RenderTarget

* Rename dpi variables to rt
2025-05-04 22:06:46 +00:00
Aaron van Geffen
846352e186 Fix park window frame after resize (#24299) 2025-05-02 13:55:43 +02:00
Aaron van Geffen
e92875e592 Fix misaligned 'flag' button with Enlarged UI enabled (#24247) 2025-04-19 09:52:50 +00:00
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
Duncan
d5de6c2b49 Start Simplifying CMake code (#24177)
* Use generator expressions

* Update cmake minimum

* Move options and remove project name

* Use further generator expressions

* Try upgrading to CMake 3.25 on Ubuntu 22.04 CI

Install software-properties-common

* Standardise with DISABLE_TTF for disable defines

* Set X64 var differently due to unknown reasons

---------

Co-authored-by: Michael Steenbeek <1478678+Gymnasiast@users.noreply.github.com>
2025-04-11 16:09:52 +01:00
Gymnasiast
4badffcdb6 Change GameState_t members to lowerCamelCase 2025-03-20 23:05:57 +01:00
Aaron van Geffen
a80762d41c Fix viewport 'listen' toggles 2025-03-19 23:47:06 +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
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
73
b9b2c96c97 Rename sprites.h to SpriteIds.h (#23804) 2025-02-13 15:51:46 +00:00
Aaron van Geffen
cf448753c1 Move WindowInvalidate and WidgetInvalidate families into WindowManager (#23692)
* Move WindowInvalidate and WidgetInvalidate families into WindowManager

* Use InvalidateWidget shorthand in more places

* Cut back on UiContext includes

* Cut back on Window.h includes

* Remove outdated parameter comments
2025-01-25 13:46:08 +01:00
Michael Steenbeek
b0c99fcb6c Refactor more constants to kConstant notation 2025-01-22 16:16:55 +00: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
7e3fe58067 Use peep animation objects for guest and staff sprites 2024-12-05 13:37:39 +01:00
Aaron van Geffen
fa06a49302 Update copyright year to 2025 (#23514) 2024-12-31 20:30:04 +01:00
Aaron van Geffen
ece199176e Move UnitConversion from Util into its own compilation unit 2024-10-29 11:27:00 +01: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
Michael Bernardi
ab558c931a Increase park rating history size from 8 bits to 16 bits 2024-09-27 04:32:33 +10:00
Harry Hopkinson
92e74e55b4 Refactor Park.h constants to kCamelCase 2024-09-24 20:41:41 +00:00
Aaron van Geffen
6d27369ea6 Rename PeepSpriteType to PeepAnimationGroup 2024-09-22 16:42:27 +02: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
003c196eb8 Cleanup gameState usage (#22692) 2024-09-04 07:34:37 +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
Greg
dae5b00f05 Close #22509: Refactor SPR_NONE to ImageIndex (#22517)
* ImageIndex typedef moved from ImageId.hpp to new file ImageIndexType.h.

* SPR_NONE redefined as ImageIndex type in ImageIndexType.h.

* SPR_NONE renamed to kSpriteIdNull

* Remove casts and enum all sprites as ImageIndex

* Remove sprites.h include from LandTool.h, RideData.h

* Ensure all RTD headers include sprites.h

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-08-11 09:58:28 +00:00
mrmbernardi
0e1ba1cacd Merge pull request #22414 from mrmbernardi/fix-graphs
Improve financial and park history graphs
2024-08-06 01:10:05 +10:00
Aaron van Geffen
03bc1e5707 Introduce isToolActive function as alternative for globals (#22430)
* Introduce isToolActive function
* Ride window: use isToolActive instead of gCurrentToolWidget
* Footpath window: use isToolActive instead of gCurrentToolWidget
* Staff window: use isToolActive instead of gCurrentToolWidget
* MazeConstruction window: use isToolActive instead of gCurrentToolWidget
* Guest window: use isToolActive instead of gCurrentToolWidget
* Map window: use isToolActive instead of gCurrentToolWidget
* LandRights window: use isToolActive instead of gCurrentToolWidget
* Replace SceneryToolIsActive legacy function with calls to isToolActive
* ClearScenery window: use isToolActive instead of gCurrentToolWidget
* Scenery window: use isToolActive instead of gCurrentToolWidget
* Water window: use isToolActive instead of gCurrentToolWidget
* Land window: use isToolActive instead of gCurrentToolWidget
* Widget: replace WidgetIsActiveTool with isToolActive
* RideConstruction window: use isToolActive instead of gCurrentToolWidget
* Ride: use isToolActive instead of gCurrentToolWidget
* TrackDesignPlace window: use isToolActive instead of gCurrentToolWidget
* StaffList window: use isToolActive instead of gCurrentToolWidget
* ViewClipping window: use isToolActive instead of gCurrentToolWidget
* PatrolArea window: use isToolActive instead of gCurrentToolWidget
* TileInspector window: use isToolActive instead of gCurrentToolWidget
* Park window: use isToolActive instead of gCurrentToolWidget
2024-08-05 10:47:36 +02: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
Aaron van Geffen
896eb4f488 Consolidate FormatStringIDLegacy, FormatStringToUpper into Formatting 2024-07-13 14:09:58 +02:00
Aaron van Geffen
3d5c19de08 Drop Localisation.h include where not required 2024-07-13 13:33:32 +02:00
Aaron van Geffen
2a6061001b Move kObjectiveNames to Objective unit 2024-07-12 23:50:59 +02:00
Aaron van Geffen
022d7756bd Move StringToMoney and MoneyToString to Currency unit 2024-07-12 23:33:26 +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
Aaron van Geffen
828aeadf5b Deal with -Wdeprecated-anon-enum-enum-conversion warnings 2024-05-11 11:24:01 +02:00
Aaron van Geffen
a63d86c488 Introduce Config namespace and struct 2024-05-10 12:10:21 +02:00