From 25d0351a520f4c44af57e4ba4990f61ac80849f0 Mon Sep 17 00:00:00 2001 From: xolatile Date: Tue, 30 Apr 2024 13:04:32 -0400 Subject: [PATCH] Removing default UI theme in code, removing folder soon... --- source/core.adb | 2 +- source/main.adb | 4 ++-- source/ui.adb | 6 +++--- source/ui.ads | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/core.adb b/source/core.adb index c3f4df9..41bc430 100644 --- a/source/core.adb +++ b/source/core.adb @@ -297,7 +297,7 @@ package body core is cursor.x := ray.get_mouse_x; cursor.y := ray.get_mouse_y; -- - ray.draw_fps (0, 0); + --~ray.draw_fps (0, 0); -- ray.end_drawing; -- diff --git a/source/main.adb b/source/main.adb index 0fc0192..b28ffe8 100644 --- a/source/main.adb +++ b/source/main.adb @@ -80,7 +80,7 @@ procedure main is procedure show_unit_menu is begin menu_insert (menu_unit); end show_unit_menu; procedure show_might_menu is begin menu_insert (menu_might); end show_might_menu; procedure show_magic_menu is begin menu_insert (menu_magic); end show_magic_menu; - procedure ui_default_style is begin ui.active := ui.default; end ui_default_style; + procedure ui_main_style is begin ui.active := ui.main; end ui_main_style; procedure ui_steam_style is begin ui.active := ui.steam; end ui_steam_style; procedure hide_top_menu is begin menu_remove; end hide_top_menu; procedure zoom_in is begin core.zoom := 2; end zoom_in; @@ -97,7 +97,7 @@ procedure main is core.signal_u => show_unit_menu'access, core.signal_m => show_might_menu'access, core.signal_n => show_magic_menu'access, - core.signal_d => ui_default_style'access, + core.signal_d => ui_main_style'access, core.signal_f => ui_steam_style'access, core.signal_grave => hide_top_menu'access, core.signal_kp_add => zoom_in'access, diff --git a/source/ui.adb b/source/ui.adb index b521bec..ad9b36d 100644 --- a/source/ui.adb +++ b/source/ui.adb @@ -132,7 +132,7 @@ package body ui is procedure configure is procedure load_ui (index : in style; folder_path : in string) is begin - glyphs (index) := core.import_font ("./sprite/ui/" & folder_path & "/font.png", (if index = default then 16 else 24), 0); + glyphs (index) := core.import_font ("./sprite/ui/" & folder_path & "/font.png", (if index = main then 16 else 24), 0); -- for this in element loop sprite (index, this) := core.import_sprite ("./sprite/ui/" & folder_path & core.lowercase (element'image (this)) & ".png", 1, 1); @@ -141,8 +141,8 @@ package body ui is begin core.echo (core.comment, "Configuring UI components..."); -- - load_ui (default, "default/"); - load_ui (steam, "steam/"); + load_ui (main, "main/"); + load_ui (steam, "steam/"); end configure; ------------------------------------------------------------------------------------------ diff --git a/source/ui.ads b/source/ui.ads index af9c3f2..d6e581e 100644 --- a/source/ui.ads +++ b/source/ui.ads @@ -9,12 +9,12 @@ package ui is ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ type style is ( - default, steam + main, steam ); ------------------------------------------------------------------------------------------ - active : style; + active : style := main; ------------------------------------------------------------------------------------------