1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Commit Graph

167 Commits

Author SHA1 Message Date
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
Aaron van Geffen
e1fa0b539d Move Widget, Window, Intent, MouseInput into OpenRCT2 namespace (#23642) 2025-01-18 15:29:41 +02: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
a55e70bc0b Remove InteractiveConsole.h includes where not required (#23578) 2025-01-09 15:40:47 +01:00
Aaron van Geffen
aa45247f21 Move WindowFind functions into WindowManager (#23517)
* Move WindowFind* functions into WindowManager

* Update parameter documentation where applicable
2025-01-08 21:12:11 +01:00
Aaron van Geffen
fa06a49302 Update copyright year to 2025 (#23514) 2024-12-31 20:30:04 +01:00
mrmbernardi
1719bbdfb7 Fix deadzone when panning while zoomed in. (#22877) 2024-10-01 23:48:08 +10:00
Michael Bernardi
8cc53324b6 Remove view width and height from Viewport struct 2024-09-27 00:07:40 +10:00
Aaron van Geffen
2a99b2f1f9 Rework modifier key state into strong enum class (#22558)
* Rework modifier key state into strong enum class

* Move modifier key state into InputManager
2024-08-14 16:36:05 +02:00
Aaron van Geffen
6e444ea170 Split off MouseInput.h from Input.h (#22564)
* Move declarations from Input.h into new MouseInput.h

* Remove unused GetNextKey function from MouseInput.cpp
2024-08-14 14:14:16 +01:00
Aaron van Geffen
aa7eb18d78 Rename ScrollBar struct to ScrollArea and rename its properties (#22539) 2024-08-11 16:21:53 +02:00
Duncan
a07b56a655 Move Viewport functions into Ui (#22454)
* Move viewport functions into ui

* Move footpath function to ui

* Don't include viewport in footpath.h

* Include missing includes
2024-08-02 06:01:31 +01:00
Duncan
681b54dc87 Add Some Items to the OpenRCT2::Ui namespace (#22423)
* Put widget in the Ui namespace

* Put theme in the Ui namespace

* Put objective in Ui namespace
2024-07-31 05:26:53 +01:00
Aaron van Geffen
3d5c19de08 Drop Localisation.h include where not required 2024-07-13 13:33:32 +02:00
Aaron van Geffen
8cef18cd2f Include cassert as needed at unit level 2024-07-09 16:43:03 +02:00
Gymnasiast
ae88b7b0fc Create progress bar widget 2024-05-19 20:20:29 +02:00
Aaron van Geffen
ef4cad5ee3 Move UI exclusive string ids to UiStringIds.h 2024-05-10 23:24:46 +02:00
Aaron van Geffen
a63d86c488 Introduce Config namespace and struct 2024-05-10 12:10:21 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
duncanspumpkin
3448926251 Move text input widget code from game lib to ui lib 2024-04-26 18:25:44 +02:00
Claudio Tiecher
a94e6c54d8 Part of #21421: replace define with constexpr (#21679) 2024-04-01 07:00:32 -03: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
Duncan
3146d463bd Move Ui header items to OpenRCT2::Ui (#21546)
* Move ui definitions to ui project

* Enforce coding style

* Apply clang format

* Add clang tidy ignore

* Increase compiler happiness
2024-03-09 14:15:45 +00:00
ζeh Matt
d95f14dcda Fix ViewportPosToMapPos using the wrong rotation 2024-03-05 10:23:30 +02:00
mrmbernardi
4ccecd6e68 Remove forwarding functions in Window.cpp (#21516) 2024-03-03 18:04:09 +01:00
Matt
c8b28ca457 Fix #21330: Tooltips from dropdown widgets have the wrong position 2024-02-10 18:47:40 +01:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
Duncan
4349688de4 These function names have not reflected their use for a while (#20656) 2023-08-01 20:19:33 +01:00
Matthias Moninger
42ff471617 Fix periodic window update function being called every frame 2023-06-22 15:52:14 +02:00
ζeh Matt
bdbb9023da Fix tool tips disappearing too quickly 2023-05-18 18:08:16 +03:00
Matthias Moninger
6bd5f75330 Update the UI at screen refresh rate (#20214)
* Update the UI at screen refresh rate

* Decouple input from ticks, fix scroll at high frame rates

* Fix holding down mouse button on buttons causing too many events

* Subtract the initial delay to keep the same behavior as before

* Guard against the rare case where the value might be 0

* Fix right click not working correctly

* Fix odd behavior when using right click to scroll lists

* Make touch work again, fix mouse panning in fullscreen (borderless)

* Update changelog.txt
2023-05-17 19:19:44 +00:00
Matthias Moninger
e9c480c66e Fix #20121: Guard against nullptr on viewport scroll (#20122) 2023-05-03 20:15:02 +01:00
Duncan
cdccb21dd5 Refactor of colours (#19998)
* Move dropdown functions to dropdown code

* Use a map for the colour tip

* Keep dropdownidx and colour seperated

* Allow number of rows to match vanilla

* Apply review comment

* Bump network version
2023-04-22 08:58:13 +00:00
kyphii
39790779bb Extend color selection dropdown with more colors (#19446)
* Setup for extended palette

* Define order for color picker cells

* Init G2 Palettes in ColoursInitMaps

* Add Glass Palettes

* Use special sprite for Invisible color

* Set up new cheat for special colors

* Add glass palettes to palette_to_g1_offset

* Add entries for new colors in TranslucentWindowPalettes

* Finish implementation of special colors cheat

* Some cleanup

* New colors almost work

* Correct g2 palette loading indices

* Invisible color sprite displays properly

* Repaint works with large scenery and walls

* Prevent random shop items from overflowing to junk palettes

* More cleanup

* Fix glass palettes

* Add mapping of new colors to original colors for UI themes

* Fix junk palettes for random shop items

* Fix missing highlight color in software renderer

* Convert small scenery support flag to allow use of new colors

* Progress on displaying new colors in software renderer

* Fix invisible color scheme sprite

* Formatting cleanup

* Resolve comparison of integer expressions of different signedness

* Index g2 palette maps to fix visible chain lift

* Progress on fixing new colors in software renderer

* Fix station and support colors

* Fix dropdown selected index

* Get invisible color (mostly) working in software renderer

* Use forceBmp for palette resources

* Remove test function definition left in by mistake

* Remove some obsolete range checks for original color values

* Add changelog entry

* Reorder color dropdown based on NE user feedback

* Some cleanup

* Further cleanup

* Formatting

* Add include for GetPaletteMapIndexForColour

* Fix a couple things I broke

* Fix function placement

* Revert "Add include for GetPaletteMapIndexForColour"

This reverts commit 0af9611e6656d792adb7a36efe7dbf3387a4a759.

* Use color constants for color order list

* Make remappable colors contiguous

* turn off clang format for ordered color list

* Appease clang

* Use all colors for random shop item animation

* Improvements to palette map resources

* Fix chain lifts again + adjustments to a few colors

* Update changelog and contributors.md

* Revert changes to S4 and S6 importers which are no longer needed

* Bump network, plugin, and minimum park versions

* Revert "Progress on displaying new colors in software renderer"

This reverts commit 337602e4a7.

* Remove unnecessary comment

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-06 08:36:07 +01:00
Duncan
e09f27df3c Rename snake_case Class names (Remaining Bits) (#19237)
* Rename snake_case Class names

* Clang format

* Fix build issues
2023-01-21 19:57:17 +00:00
Duncan
23b6d1840e Rename classes with snakes OpenRCT2/G*-M* 2023-01-19 15:13:23 +00:00
Hielke Morsink
6b7dc8fcdb Rename snake_case functions in openrct2/src folder
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2023-01-17 13:24:51 +01:00
Gymnasiast
5309c80e29 Remove snake_case in interface folder 2023-01-16 22:20:41 +01:00
Hielke Morsink
6dafbbfb65 Rename global window functions to TitleCase (#19167) 2023-01-16 20:13:42 +00:00
James103
73738bbdc8 Replace 2022 with 2023 in copyright headers
Replace all instances of the year 2022 with 2023 in all copyright headers
2023-01-01 11:58:01 +01:00
Gymnasiast
162b01204d Rename rct_widget to Widget 2022-12-31 15:18:22 +01:00
ccahiggins
279675ba45 Add shift and control modifiers to close window button (#18537)
Shift closes all but current window.
Control closes all windows of the same window class/type.

Co-authored-by: Chris Higgins <chrissywissywoo@hotmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2022-12-27 12:22:18 +00:00
Haven Kim
69e5439484 Fix #17067: Random Staff Patrol Area clicks (#18329)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2022-11-16 00:13:24 +00:00
Duncan
482971710d Apply code style to context functions 2022-11-06 21:49:07 +01:00
Meehoi
d1baf094af Show cursor when using inverted mouse dragging (#17998) 2022-11-05 08:20:53 +01:00
Hielke Morsink
abac080d3e Rename public general config data members 2022-10-16 21:46:01 +02:00
Michael Steenbeek
99e13e023e Name unknown_15 window event as ScrollSelect
Co-authored-by: leoleotte <leoleotte@users.noreply.github.com>
2022-10-05 21:59:20 +02:00
73
b9e677945d Replace 20XX with 2022 (#18158)
* Replace 2020 with 2022

Replace all 2020 headers with 2022

* replace other years with 2022

add missing years
2022-10-01 08:42:14 +01:00
Hielke Morsink
43dbf9eb18 Fix #18032: non-interactive widgets produce sound 2022-09-19 20:38:34 +00:00
Gymnasiast
ae8b2b8374 Remove unused window events 2022-08-27 16:50:02 +02:00