cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prettified storage UI (#84160)

Browse Source 
## About The Pull Request

This PR rewrites some storage UI code to make it compose itself from
multiple elements (corners and row connectors) and allow it to be
affected by player's preferred UI theme.
Also resprites it and adds variations for all themes.

Midnight (Default UI theme, the example doesn't show it very well but
the cells are rather transparent)


![image](https://github.com/tgstation/tgstation/assets/44720187/62c54417-ee38-4000-bea2-a8fab3b935c4)

Some examples of other themes. (Shows transparency much better)


![изображение](https://github.com/tgstation/tgstation/assets/44720187/9323dab9-d127-4f51-9ea0-7057bb7e022c)

![изображение](https://github.com/tgstation/tgstation/assets/44720187/368e775a-6644-4372-b66a-0e33f790b7bf)

## Why It's Good For The Game

Storage UI is ancient and doesn't look very good, nor fit the modern UI
in general.

## Changelog
🆑
code: Rewrote a portion of storage UI code to allow it to be influenced
by UI style.
image: Prettified storage UI and made it affected by UI theme.
/🆑

---------

Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
SmArtKar
2024-06-28 15:38:00 -07:00
committed by GitHub
co-authored by san7890
parent 2044b523fc
commit 6a7e6ad3b5
14 changed files with 188 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/storage/storage_interface.dm
+67
View File
@@ -0,0 +1,67 @@
/// Datum tracker for storage UI
/datum/storage_interface
/// UI elements for this theme
var/atom/movable/screen/close/closer
var/atom/movable/screen/storage/cells
var/atom/movable/screen/storage/corner/corner_top_left
var/atom/movable/screen/storage/corner/top_right/corner_top_right
var/atom/movable/screen/storage/corner/bottom_left/corner_bottom_left
var/atom/movable/screen/storage/corner/bottom_right/corner_bottom_right
var/atom/movable/screen/storage/rowjoin/rowjoin_left
var/atom/movable/screen/storage/rowjoin/right/rowjoin_right
/// Storage that owns us
var/datum/storage/parent_storage
/datum/storage_interface/New(ui_style, parent_storage)
..()
src.parent_storage = parent_storage
closer = new(null, null, parent_storage)
cells = new(null, null, parent_storage)
corner_top_left = new(null, null, parent_storage)
corner_top_right = new(null, null, parent_storage)
corner_bottom_left = new(null, null, parent_storage)
corner_bottom_right = new(null, null, parent_storage)
rowjoin_left = new(null, null, parent_storage)
rowjoin_right = new(null, null, parent_storage)
for (var/atom/movable/screen/ui_elem as anything in list_ui_elements())
ui_elem.icon = ui_style
/// Returns all UI elements under this theme
/datum/storage_interface/proc/list_ui_elements()
return list(cells, corner_top_left, corner_top_right, corner_bottom_left, corner_bottom_right, rowjoin_left, rowjoin_right, closer)
/datum/storage_interface/Destroy(force)
QDEL_NULL(cells)
QDEL_NULL(corner_top_left)
QDEL_NULL(corner_top_right)
QDEL_NULL(corner_bottom_left)
QDEL_NULL(corner_bottom_right)
QDEL_NULL(rowjoin_left)
QDEL_NULL(rowjoin_right)
parent_storage = null
return ..()
/// Updates position of all UI elements
/datum/storage_interface/proc/update_position(screen_start_x, screen_pixel_x, screen_start_y, screen_pixel_y, columns, rows)
var/start_pixel_x = screen_start_x * 32 + screen_pixel_x
var/start_pixel_y = screen_start_y * 32 + screen_pixel_y
var/end_pixel_x = start_pixel_x + (columns - 1) * 32
var/end_pixel_y = start_pixel_y + (rows - 1) * 32
cells.screen_loc = spanning_screen_loc(start_pixel_x, start_pixel_y, end_pixel_x, end_pixel_y)
var/left_edge_loc = spanning_screen_loc(start_pixel_x + 32, start_pixel_y, end_pixel_x, end_pixel_y)
var/right_edge_loc = spanning_screen_loc(start_pixel_x, start_pixel_y, end_pixel_x + max(0, (columns - 2)) * 32, end_pixel_y)
corner_top_left.screen_loc = left_edge_loc
corner_top_right.screen_loc = right_edge_loc
corner_bottom_left.screen_loc = left_edge_loc
corner_bottom_right.screen_loc = right_edge_loc
var/row_loc = spanning_screen_loc(start_pixel_x, start_pixel_y + 27, end_pixel_x, end_pixel_y + 27 + max(0, rows - 2) * 32)
rowjoin_left.screen_loc = row_loc
rowjoin_left.alpha = (rows > 1) * 255
rowjoin_right.screen_loc = row_loc
rowjoin_right.alpha = (rows > 1) * 255
closer.screen_loc = "[screen_start_x + columns]:[screen_pixel_x - 5],[screen_start_y]:[screen_pixel_y]"