From 56bb6a59e251d54217be7d9575cab61e844d44e6 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Wed, 22 Apr 2026 08:32:25 -0500 Subject: [PATCH] Tweak layout so that player account info is always in the top right but the 'battleview/friends' container can be hidden --- lib/states/interface.rb | 123 +++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 57 deletions(-) diff --git a/lib/states/interface.rb b/lib/states/interface.rb index 8ff4404..6a66cd1 100644 --- a/lib/states/interface.rb +++ b/lib/states/interface.rb @@ -7,9 +7,9 @@ module W3DHubLauncher # root container - background image stack(width: 1.0, height: 1.0, background_image: safe_get_image("/run/media/cyberarm/Storage/W3DHub/Launcher/package-cache/games/apb/background.png.package"), background_image_mode: :fill) do # root container - background image tint - flow(width: 1.0, height: 1.0, background: ALPHA_BLACK) do + stack(width: 1.0, height: 1.0, background: ALPHA_BLACK) do # content container - stack(fill: true, height: 1.0, margin: PADDING, margin_right: LARGE_PADDING) do + stack(width: 1.0, fill: true, margin: PADDING) do # header bar container flow(width: 1.0, height: 80, margin_bottom: PADDING) do |c| # logo + menu button @@ -36,73 +36,76 @@ module W3DHubLauncher end stack(fill: true) end - end - # page content container - @page_host = stack(width: 1.0, fill: true) do - end - end - - # battleview/friends container - stack(width: 300, height: 1.0, margin: PADDING, margin_left: 0) do - # self account container - flow(width: 1.0, height: 80) do - # self avatar container - stack(width: 80, height: 1.0, background_image: rounded_avatar(safe_get_image("#{ROOT_PATH}/media/default.png"))) do - # self online state container - stack(width: 20, height: 20, v_align: :bottom, h_align: :right, background_image: safe_get_image("#{ROOT_PATH}/media/ui/circle_small.png"), background_image_color: 0xff_26a269) - end - - stack(fill: true, height: 1.0, margin_left: HALF_PADDING) do - flow(fill: true) - # self name - caption "cyberarm", font: FONT_BLACK, text_wrap: :none - # self set online state - link "Online ▼", text_size: 18 do |l| - menu(parent: l) do - menu_item("Online") - menu_item("Do Not Disturb") - menu_item("Away") - menu_item("Invisible") - menu_item("Sign Out") - end.show + # self account container + flow(width: 300, height: 80, margin_left: LARGE_PADDING) do + # self avatar container + stack(width: 80, height: 1.0, background_image: rounded_avatar(safe_get_image("#{ROOT_PATH}/media/default.png"))) do + # self online state container + stack(width: 20, height: 20, v_align: :bottom, h_align: :right, background_image: safe_get_image("#{ROOT_PATH}/media/ui/circle_small.png"), background_image_color: 0xff_26a269) + end + + stack(fill: true, height: 1.0, margin_left: HALF_PADDING) do + flow(fill: true) + # self name + caption "cyberarm", font: FONT_BLACK, text_wrap: :none + # self set online state + link "Online ▼", text_size: 18 do |l| + menu(parent: l) do + menu_item("Online") + menu_item("Do Not Disturb") + menu_item("Away") + menu_item("Invisible") + menu_item("Sign Out") + end.show + end + flow(fill: true) end - flow(fill: true) end end - # friend management container - flow(width: 1.0, height: 60, margin_top: PADDING) do - flow(width: 1.0, v_align: :center) do - button safe_get_image("#{ROOT_PATH}/media/icons/singleplayer.png"), image_height: 1.0 - button safe_get_image("#{ROOT_PATH}/media/icons/gear.png"), image_height: 1.0, margin_left: HALF_PADDING - edit_line "", margin_left: HALF_PADDING, fill: true, height: 1.0 + # layout container + flow(width: 1.0, fill: true) do + # page host container + @page_host = stack(fill: true, height: 1.0) do end - end - # friends/clanmates list container - stack(width: 1.0, fill: true, margin_top: LARGE_PADDING, scroll: true) do - 50.times do |i| - # friend container - widget(width: 1.0, height: 48, padding_top: HALF_PADDING, padding_bottom: HALF_PADDING, background_nine_slice: NINE_SLICE_ROUNDED, background_nine_slice_from_edge: NINE_SLICE_EDGE, background_nine_slice_color: 0, hover: { background_nine_slice_color: ALPHA_GRAY }, active: { background_nine_slice_color: ALPHA_BLACK }) do |w| - w.subscribe(:clicked_left_mouse_button) do - puts "HELLO THERE" + # battleview/friends container + @battleview_container = stack(width: 300, height: 1.0, margin_left: LARGE_PADDING, visible: true) do + # friend management container + flow(width: 1.0, height: 60) do + flow(width: 1.0, v_align: :center) do + button safe_get_image("#{ROOT_PATH}/media/icons/singleplayer.png"), image_height: 1.0 + button safe_get_image("#{ROOT_PATH}/media/icons/gear.png"), image_height: 1.0, margin_left: HALF_PADDING + edit_line "", margin_left: HALF_PADDING, fill: true, height: 1.0 end + end + + # friends/clanmates list container + stack(width: 1.0, fill: true, margin_top: LARGE_PADDING, scroll: true) do + 50.times do |i| + # friend container + widget(width: 1.0, height: 48, padding_top: HALF_PADDING, padding_bottom: HALF_PADDING, background_nine_slice: NINE_SLICE_ROUNDED, background_nine_slice_from_edge: NINE_SLICE_EDGE, background_nine_slice_color: 0, hover: { background_nine_slice_color: ALPHA_GRAY }, active: { background_nine_slice_color: ALPHA_BLACK }) do |w| + w.subscribe(:clicked_left_mouse_button) do + puts "HELLO THERE" + end - # friend avatar container - stack(width: 48, height: 1.0, margin_left: HALF_PADDING, background_image: rounded_avatar(safe_get_image("#{ROOT_PATH}/media/default.png"))) do - stack(width: 12, height: 12, v_align: :bottom, h_align: :right, background_image: safe_get_image("#{ROOT_PATH}/media/ui/circle_small.png"), background_image_color: 0xff_26a269) - end - # friend name and status container - stack(fill: true, height: 1.0, margin_left: HALF_PADDING, margin_right: HALF_PADDING) do - stack(v_align: :center) do - caption ["Silverlight", "PXD2000", "Alstar", "SteelGhost", "FRAYDO"].sample, text_wrap: :none - inscription "RA_Under • 13:52", text_wrap: :none, margin_top: -HALF_PADDING + # friend avatar container + stack(width: 48, height: 1.0, margin_left: HALF_PADDING, background_image: rounded_avatar(safe_get_image("#{ROOT_PATH}/media/default.png"))) do + stack(width: 12, height: 12, v_align: :bottom, h_align: :right, background_image: safe_get_image("#{ROOT_PATH}/media/ui/circle_small.png"), background_image_color: 0xff_26a269) + end + # friend name and status container + stack(fill: true, height: 1.0, margin_left: HALF_PADDING, margin_right: HALF_PADDING) do + stack(v_align: :center) do + caption ["Silverlight", "PXD2000", "Alstar", "SteelGhost", "FRAYDO"].sample, text_wrap: :none + inscription "RA_Under • 13:52", text_wrap: :none, margin_top: -HALF_PADDING + end + end + # friend active application container + stack(width: 48, height: 1.0, margin_right: HALF_PADDING, background_image: safe_get_image("#{ROOT_PATH}/media/logo.png")) end end - # friend active application container - stack(width: 48, height: 1.0, margin_right: HALF_PADDING, background_image: safe_get_image("#{ROOT_PATH}/media/logo.png")) end end end @@ -112,6 +115,12 @@ module W3DHubLauncher page(Page::Games) end + + def button_up(id) + super + + @battleview_container.toggle if id == Gosu::KB_F8 + end end end end