From 02aa9514aba14216601b3f926e074c710d4349e7 Mon Sep 17 00:00:00 2001 From: Nordup Date: Tue, 19 Nov 2024 01:33:38 +0400 Subject: [PATCH] thinner icons, buttons cursor fix --- app/assets/new_textures/arrow-left.svg | 6 ++-- app/assets/new_textures/arrow-right.svg | 28 ++-------------- app/assets/new_textures/close-tab.svg | 4 +-- app/assets/new_textures/close.svg | 26 ++------------- app/assets/new_textures/help.svg | 30 +++-------------- app/assets/new_textures/home.svg | 24 +------------- app/assets/new_textures/icon-round.svg.import | 12 ++++--- app/assets/new_textures/maximaze.svg | 24 +------------- app/assets/new_textures/menu.svg | 32 +++---------------- app/assets/new_textures/minimize.svg | 24 +------------- app/assets/new_textures/plus.svg | 26 ++------------- app/assets/new_textures/reload.svg | 28 ++-------------- app/assets/new_textures/search-96.svg | 26 ++------------- app/assets/new_textures/search.svg | 26 ++------------- app/assets/new_textures/star-color.svg | 2 +- app/assets/new_textures/star.svg | 2 +- app/assets/new_textures/starred.svg | 2 +- app/scenes/components/button.tscn | 21 ------------ app/scenes/components/round_button.tscn | 21 ++++++++++++ app/scenes/components/tab.tscn | 9 +++++- app/scenes/menu.tscn | 11 +++++-- app/scripts/ui/menu/menu_navigation.gd | 20 +++++------- app/scripts/ui/menu/round_button.gd | 23 +++++++++++++ 23 files changed, 110 insertions(+), 317 deletions(-) delete mode 100644 app/scenes/components/button.tscn create mode 100644 app/scenes/components/round_button.tscn create mode 100644 app/scripts/ui/menu/round_button.gd diff --git a/app/assets/new_textures/arrow-left.svg b/app/assets/new_textures/arrow-left.svg index 0464cf5..28707ba 100644 --- a/app/assets/new_textures/arrow-left.svg +++ b/app/assets/new_textures/arrow-left.svg @@ -15,12 +15,12 @@ id="g1" transform="rotate(180,30.4,29.825)"> diff --git a/app/assets/new_textures/arrow-right.svg b/app/assets/new_textures/arrow-right.svg index c90e1dc..8088d17 100644 --- a/app/assets/new_textures/arrow-right.svg +++ b/app/assets/new_textures/arrow-right.svg @@ -7,42 +7,20 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_arrow.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/close-tab.svg b/app/assets/new_textures/close-tab.svg index b8fba36..34852cc 100644 --- a/app/assets/new_textures/close-tab.svg +++ b/app/assets/new_textures/close-tab.svg @@ -16,11 +16,11 @@ transform="matrix(0.88571429,0,0,0.88571429,3.6571437,3.6571437)" style="stroke-width:1.12903"> diff --git a/app/assets/new_textures/close.svg b/app/assets/new_textures/close.svg index d3be27a..147fc60 100644 --- a/app/assets/new_textures/close.svg +++ b/app/assets/new_textures/close.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_close.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/help.svg b/app/assets/new_textures/help.svg index ae551b9..348979f 100644 --- a/app/assets/new_textures/help.svg +++ b/app/assets/new_textures/help.svg @@ -7,30 +7,8 @@ width="96" height="96" viewBox="0 0 96 96" - sodipodi:docname="5_help.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/home.svg b/app/assets/new_textures/home.svg index 51397de..b9deddc 100644 --- a/app/assets/new_textures/home.svg +++ b/app/assets/new_textures/home.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_home.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/icon-round.svg.import b/app/assets/new_textures/icon-round.svg.import index fa301c0..3aa6b05 100644 --- a/app/assets/new_textures/icon-round.svg.import +++ b/app/assets/new_textures/icon-round.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://bw1cffhlt112i" -path="res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.ctex" +path.bptc="res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.bptc.ctex" +path.astc="res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.astc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/new_textures/icon-round.svg" -dest_files=["res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.ctex"] +dest_files=["res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.bptc.ctex", "res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.astc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=true compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=2.0 +svg/scale=0.5 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/maximaze.svg b/app/assets/new_textures/maximaze.svg index 0ad2b7d..7eebcae 100644 --- a/app/assets/new_textures/maximaze.svg +++ b/app/assets/new_textures/maximaze.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_maximaze.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - - diff --git a/app/assets/new_textures/minimize.svg b/app/assets/new_textures/minimize.svg index b61028b..c7ee7e4 100644 --- a/app/assets/new_textures/minimize.svg +++ b/app/assets/new_textures/minimize.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_minimize.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/plus.svg b/app/assets/new_textures/plus.svg index 7a8ef67..f5d0386 100644 --- a/app/assets/new_textures/plus.svg +++ b/app/assets/new_textures/plus.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_plus.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/reload.svg b/app/assets/new_textures/reload.svg index e627f14..9ba3f1c 100644 --- a/app/assets/new_textures/reload.svg +++ b/app/assets/new_textures/reload.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_reload.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/search-96.svg b/app/assets/new_textures/search-96.svg index 9339472..3063b80 100644 --- a/app/assets/new_textures/search-96.svg +++ b/app/assets/new_textures/search-96.svg @@ -7,30 +7,8 @@ width="96" height="96" viewBox="0 0 96 96" - sodipodi:docname="5_search-96.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/search.svg b/app/assets/new_textures/search.svg index 66af6f9..eba6fbf 100644 --- a/app/assets/new_textures/search.svg +++ b/app/assets/new_textures/search.svg @@ -7,30 +7,8 @@ width="64" height="64" viewBox="0 0 64 64" - sodipodi:docname="5_search.svg" - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - diff --git a/app/assets/new_textures/star-color.svg b/app/assets/new_textures/star-color.svg index 9f8dade..cdab53b 100644 --- a/app/assets/new_textures/star-color.svg +++ b/app/assets/new_textures/star-color.svg @@ -54,7 +54,7 @@ diff --git a/app/assets/new_textures/star.svg b/app/assets/new_textures/star.svg index 90383c9..34f2288 100644 --- a/app/assets/new_textures/star.svg +++ b/app/assets/new_textures/star.svg @@ -14,7 +14,7 @@ diff --git a/app/assets/new_textures/starred.svg b/app/assets/new_textures/starred.svg index 383b379..cb5ff10 100644 --- a/app/assets/new_textures/starred.svg +++ b/app/assets/new_textures/starred.svg @@ -14,7 +14,7 @@ diff --git a/app/scenes/components/button.tscn b/app/scenes/components/button.tscn deleted file mode 100644 index d6f7976..0000000 --- a/app/scenes/components/button.tscn +++ /dev/null @@ -1,21 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://xagbhqfidf2"] - -[ext_resource type="StyleBox" uid="uid://b4j4kd2p3aypx" path="res://assets/styles/button.stylebox" id="1_n17s0"] -[ext_resource type="StyleBox" uid="uid://ck127amfs72dv" path="res://assets/styles/button_hover.stylebox" id="2_rltks"] -[ext_resource type="Texture2D" uid="uid://bevejhgdw7mey" path="res://assets/new_textures/close.svg" id="2_yeqne"] - -[node name="Button" type="Button"] -texture_filter = 4 -custom_minimum_size = Vector2(26, 26) -size_flags_vertical = 4 -theme_override_colors/icon_normal_color = Color(0.831373, 0.831373, 0.831373, 1) -theme_override_colors/icon_disabled_color = Color(0.431373, 0.435294, 0.494118, 1) -theme_override_styles/focus = ExtResource("1_n17s0") -theme_override_styles/disabled = ExtResource("1_n17s0") -theme_override_styles/hover = ExtResource("2_rltks") -theme_override_styles/pressed = ExtResource("1_n17s0") -theme_override_styles/normal = ExtResource("1_n17s0") -icon = ExtResource("2_yeqne") -expand_icon = true - -[connection signal="button_up" from="." to="." method="release_focus"] diff --git a/app/scenes/components/round_button.tscn b/app/scenes/components/round_button.tscn new file mode 100644 index 0000000..60134d5 --- /dev/null +++ b/app/scenes/components/round_button.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=5 format=3 uid="uid://xagbhqfidf2"] + +[ext_resource type="StyleBox" uid="uid://b4j4kd2p3aypx" path="res://assets/styles/button.stylebox" id="1_6dhuv"] +[ext_resource type="StyleBox" uid="uid://ck127amfs72dv" path="res://assets/styles/button_hover.stylebox" id="2_3cilb"] +[ext_resource type="Texture2D" uid="uid://bevejhgdw7mey" path="res://assets/new_textures/close.svg" id="3_t5vxw"] +[ext_resource type="Script" path="res://scripts/ui/menu/round_button.gd" id="4_7t145"] + +[node name="RoundButton" type="Button"] +texture_filter = 4 +custom_minimum_size = Vector2(26, 26) +size_flags_vertical = 4 +theme_override_colors/icon_normal_color = Color(0.831373, 0.831373, 0.831373, 1) +theme_override_colors/icon_disabled_color = Color(0.431373, 0.435294, 0.494118, 1) +theme_override_styles/focus = ExtResource("1_6dhuv") +theme_override_styles/disabled = ExtResource("1_6dhuv") +theme_override_styles/hover = ExtResource("2_3cilb") +theme_override_styles/pressed = ExtResource("1_6dhuv") +theme_override_styles/normal = ExtResource("1_6dhuv") +icon = ExtResource("3_t5vxw") +expand_icon = true +script = ExtResource("4_7t145") diff --git a/app/scenes/components/tab.tscn b/app/scenes/components/tab.tscn index ed2fe52..e39f533 100644 --- a/app/scenes/components/tab.tscn +++ b/app/scenes/components/tab.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://dkfy3rcfbxqc6"] +[gd_scene load_steps=9 format=3 uid="uid://dkfy3rcfbxqc6"] [ext_resource type="StyleBox" uid="uid://cf4jgdfsjmjxl" path="res://assets/styles/tab.stylebox" id="1_8hbf0"] [ext_resource type="Texture2D" uid="uid://bw1cffhlt112i" path="res://assets/new_textures/icon-round.svg" id="1_jc4ra"] @@ -11,6 +11,10 @@ corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_lq3t8"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_hghgl"] + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_id0w2"] [node name="Tab" type="Control"] @@ -78,6 +82,9 @@ custom_minimum_size = Vector2(14, 14) layout_mode = 2 size_flags_vertical = 4 theme_override_colors/icon_normal_color = Color(0.831373, 0.831373, 0.831373, 1) +theme_override_styles/focus = SubResource("StyleBoxEmpty_lq3t8") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_hghgl") theme_override_styles/normal = SubResource("StyleBoxEmpty_id0w2") +disabled = true icon = ExtResource("2_y6odh") expand_icon = true diff --git a/app/scenes/menu.tscn b/app/scenes/menu.tscn index ccaaa55..fafc008 100644 --- a/app/scenes/menu.tscn +++ b/app/scenes/menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://5btb7nvgmfhl"] +[gd_scene load_steps=28 format=3 uid="uid://5btb7nvgmfhl"] [ext_resource type="Script" path="res://scripts/ui/menu/menu_navigation.gd" id="1_7anvm"] [ext_resource type="Script" path="res://scripts/ui/menu/menu.gd" id="1_o6vga"] @@ -7,7 +7,7 @@ [ext_resource type="Resource" uid="uid://bqgikyax6jfqa" path="res://resources/history.tres" id="3_wi554"] [ext_resource type="Texture2D" uid="uid://c80732g67qmvx" path="res://assets/new_textures/plus.svg" id="4_rdyyc"] [ext_resource type="PackedScene" uid="uid://ctam0fxigbefk" path="res://scenes/components/search.tscn" id="5_li2do"] -[ext_resource type="PackedScene" uid="uid://xagbhqfidf2" path="res://scenes/components/button.tscn" id="6_gxcmo"] +[ext_resource type="PackedScene" uid="uid://xagbhqfidf2" path="res://scenes/components/round_button.tscn" id="6_gxcmo"] [ext_resource type="Script" path="res://scripts/ui/fullscreen_animation.gd" id="7_1hi62"] [ext_resource type="Texture2D" uid="uid://d1ehc1xs5hwyn" path="res://assets/new_textures/minimize.svg" id="7_ab04l"] [ext_resource type="Resource" uid="uid://crjhix0osmtnf" path="res://resources/ui_events.res" id="8_8dnbq"] @@ -22,6 +22,10 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pveoh"] bg_color = Color(0.0980392, 0.101961, 0.133333, 1) +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_qg3ls"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_eo1gx"] + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cjjfu"] [sub_resource type="StyleBoxLine" id="StyleBoxLine_4myyc"] @@ -183,7 +187,10 @@ custom_minimum_size = Vector2(14, 14) layout_mode = 2 size_flags_vertical = 4 theme_override_colors/icon_normal_color = Color(0.831373, 0.831373, 0.831373, 1) +theme_override_styles/focus = SubResource("StyleBoxEmpty_qg3ls") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_eo1gx") theme_override_styles/normal = SubResource("StyleBoxEmpty_cjjfu") +disabled = true icon = ExtResource("4_rdyyc") expand_icon = true diff --git a/app/scripts/ui/menu/menu_navigation.gd b/app/scripts/ui/menu/menu_navigation.gd index 59cb513..a2c1c77 100644 --- a/app/scripts/ui/menu/menu_navigation.gd +++ b/app/scripts/ui/menu/menu_navigation.gd @@ -3,10 +3,10 @@ extends Node @export var gate_events: GateEvents @export var history: History -@export var go_back: BaseButton -@export var go_forw: BaseButton -@export var reload: BaseButton -@export var home: BaseButton +@export var go_back: RoundButton +@export var go_forw: RoundButton +@export var reload: RoundButton +@export var home: RoundButton func _ready() -> void: @@ -66,15 +66,11 @@ func open(location: String) -> void: gate_events.search_emit(location) -func disable(buttons: Array[BaseButton]) -> void: +func disable(buttons: Array[RoundButton]) -> void: for button in buttons: - button.disabled = true - button.modulate.a = 0.5 - button.mouse_default_cursor_shape = Control.CURSOR_ARROW + button.disable() -func enable(buttons: Array[BaseButton]) -> void: +func enable(buttons: Array[RoundButton]) -> void: for button in buttons: - button.disabled = false - button.modulate.a = 1 - button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND + button.enable() diff --git a/app/scripts/ui/menu/round_button.gd b/app/scripts/ui/menu/round_button.gd new file mode 100644 index 0000000..3b12412 --- /dev/null +++ b/app/scripts/ui/menu/round_button.gd @@ -0,0 +1,23 @@ +extends Button +class_name RoundButton + + +func _ready() -> void: + if disabled: disable() + else: enable() + + button_up.connect(on_button_up) + + +func on_button_up() -> void: + release_focus() + + +func disable() -> void: + disabled = true + mouse_default_cursor_shape = Control.CURSOR_ARROW + + +func enable() -> void: + disabled = false + mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND