From 7dd71a804511146357fc78b10d6b81c9efda1d2e Mon Sep 17 00:00:00 2001 From: dam Date: Sat, 9 Apr 2022 02:13:30 +0000 Subject: Chanted is_urgency button type. Made buttons lighter. --- icons/add.png | Bin 3030 -> 0 bytes icons/add.png.import | 38 --------------------- icons/delete.png | Bin 4410 -> 0 bytes icons/delete.png.import | 38 --------------------- icons/edit.png | Bin 5449 -> 0 bytes icons/edit.png.import | 38 --------------------- main.tscn | 4 ++- readme.md | 4 +-- themes/dark.tres | 6 ++-- .../touch_vertical_container.gd | 2 +- 10 files changed, 9 insertions(+), 121 deletions(-) delete mode 100644 icons/add.png delete mode 100644 icons/add.png.import delete mode 100644 icons/delete.png delete mode 100644 icons/delete.png.import delete mode 100755 icons/edit.png delete mode 100644 icons/edit.png.import diff --git a/icons/add.png b/icons/add.png deleted file mode 100644 index 074a6c1..0000000 Binary files a/icons/add.png and /dev/null differ diff --git a/icons/add.png.import b/icons/add.png.import deleted file mode 100644 index f726327..0000000 --- a/icons/add.png.import +++ /dev/null @@ -1,38 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.s3tc.stex" -path.etc2="res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.etc2.stex" -path.etc="res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.etc.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2", "etc" ], -"vram_texture": true -} - -[deps] - -source_file="res://icons/add.png" -dest_files=[ "res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.s3tc.stex", "res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.etc2.stex", "res://.import/add.png-21abb41ff0da259ea2ccbb4becce111a.etc.stex" ] - -[params] - -compress/mode=2 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=true -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=false -process/premult_alpha=true -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/icons/delete.png b/icons/delete.png deleted file mode 100644 index 2b1f562..0000000 Binary files a/icons/delete.png and /dev/null differ diff --git a/icons/delete.png.import b/icons/delete.png.import deleted file mode 100644 index eaad4c1..0000000 --- a/icons/delete.png.import +++ /dev/null @@ -1,38 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.s3tc.stex" -path.etc2="res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.etc2.stex" -path.etc="res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.etc.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2", "etc" ], -"vram_texture": true -} - -[deps] - -source_file="res://icons/delete.png" -dest_files=[ "res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.s3tc.stex", "res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.etc2.stex", "res://.import/delete.png-48500a9e66ed6e102e89aa5542feee73.etc.stex" ] - -[params] - -compress/mode=2 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=true -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=false -process/premult_alpha=true -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/icons/edit.png b/icons/edit.png deleted file mode 100755 index 01fb607..0000000 Binary files a/icons/edit.png and /dev/null differ diff --git a/icons/edit.png.import b/icons/edit.png.import deleted file mode 100644 index baee812..0000000 --- a/icons/edit.png.import +++ /dev/null @@ -1,38 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.s3tc.stex" -path.etc2="res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.etc2.stex" -path.etc="res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.etc.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2", "etc" ], -"vram_texture": true -} - -[deps] - -source_file="res://icons/edit.png" -dest_files=[ "res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.s3tc.stex", "res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.etc2.stex", "res://.import/edit.png-d9148ff44b5b1c8f3b0a53a3c3c7c1c0.etc.stex" ] - -[params] - -compress/mode=2 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=true -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=false -process/premult_alpha=true -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/main.tscn b/main.tscn index f7a0d0a..d70be12 100644 --- a/main.tscn +++ b/main.tscn @@ -195,12 +195,14 @@ margin_bottom = 992.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Intervention" -[node name="is_urgency" type="CheckButton" parent="stage/controls" index="12"] +[node name="is_urgency" type="Button" parent="stage/controls" index="12"] margin_top = 1002.0 margin_right = 1080.0 margin_bottom = 1064.0 rect_min_size = Vector2( 0, 62 ) +toggle_mode = true text = "Is urgency" +align = 0 [node name="notes" type="LineEdit" parent="stage/controls" index="13"] margin_top = 1074.0 diff --git a/readme.md b/readme.md index d0992b2..7e7d02b 100644 --- a/readme.md +++ b/readme.md @@ -70,8 +70,8 @@ Surgery Log - [ ] Buttons normal are too dark; - [ ] Dialog buttons and stage items have minimum vertical size set to 62; maybe do this on theme; - [ ] LineEdit: thinner lines on normal; bigger brighter lines on focus; more vertical content margin - - [ ] Smaller font - - [ ] Rounder buttons + - [x] Smaller font + - [x] Rounder buttons - [ ] Increase buttons height - [ ] Make database and stage buttons equal; - [ ] Apply theme on menubutton popup; diff --git a/themes/dark.tres b/themes/dark.tres index e50b548..8ec4e1b 100644 --- a/themes/dark.tres +++ b/themes/dark.tres @@ -10,7 +10,7 @@ content_margin_right = 10.0 [sub_resource type="StyleBoxFlat" id=11] content_margin_left = 10.0 content_margin_right = 10.0 -bg_color = Color( 0.22, 0.35, 0.5, 0.5 ) +bg_color = Color( 0.135, 0.20925, 0.3, 1 ) corner_radius_top_left = 15 corner_radius_top_right = 15 corner_radius_bottom_right = 15 @@ -19,7 +19,7 @@ corner_radius_bottom_left = 15 [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 10.0 content_margin_right = 10.0 -bg_color = Color( 0.11, 0.11, 0.11, 1 ) +bg_color = Color( 0.25, 0.25, 0.25, 1 ) corner_radius_top_left = 15 corner_radius_top_right = 15 corner_radius_bottom_right = 15 @@ -53,7 +53,7 @@ border_width_bottom = 2 border_color = Color( 0.329412, 0.329412, 0.329412, 1 ) [sub_resource type="StyleBoxFlat" id=12] -bg_color = Color( 0.22, 0.22, 0.22, 1 ) +bg_color = Color( 0.15, 0.15, 0.15, 1 ) corner_radius_top_left = 15 corner_radius_top_right = 15 corner_radius_bottom_right = 15 diff --git a/touch_vertical_container/touch_vertical_container.gd b/touch_vertical_container/touch_vertical_container.gd index 4633c64..8f87338 100644 --- a/touch_vertical_container/touch_vertical_container.gd +++ b/touch_vertical_container/touch_vertical_container.gd @@ -99,7 +99,7 @@ func pointer_input_on_click_handler(pointer: PointerInputSensor.PointerInputData continue var control: Control = node - if control is CheckBox || control is CheckButton: + if control is CheckBox || control is CheckButton || (control is Button && control.toggle_mode == true): control.pressed = !control.pressed control.grab_focus() -- cgit v1.2.3