From 469f9bf4d34da4d9f2d83ad10f6fd59f15741c80 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Tue, 9 Aug 2022 04:18:11 +0300 Subject: [PATCH] Use theme type variations for RulerButtons and TopMenuContainer --- assets/themes/blue/theme.tres | 31 +++++++++++++++----------- assets/themes/caramel/theme.tres | 31 ++++++++++++++------------ assets/themes/dark/theme.tres | 29 ++++++++++++++----------- assets/themes/gray/theme.tres | 31 ++++++++++++++------------ assets/themes/light/theme.tres | 31 ++++++++++++++------------ assets/themes/purple/theme.tres | 37 ++++++++++++++++++-------------- src/Preferences/HandleThemes.gd | 13 ----------- src/UI/TopMenuContainer.tscn | 1 + src/UI/UI.tscn | 2 ++ 9 files changed, 110 insertions(+), 96 deletions(-) diff --git a/assets/themes/blue/theme.tres b/assets/themes/blue/theme.tres index c9b793948..df48b09c0 100644 --- a/assets/themes/blue/theme.tres +++ b/assets/themes/blue/theme.tres @@ -2,14 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] -[sub_resource type="StyleBoxFlat" id=1] -content_margin_left = 1.0 -bg_color = Color( 0.12549, 0.145098, 0.192157, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -838,9 +830,6 @@ flags = 0 image = SubResource( 199 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=96] -bg_color = Color( 0.12549, 0.145098, 0.192157, 1 ) - [sub_resource type="StyleBoxFlat" id=97] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1010,6 +999,14 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=117] +[sub_resource type="StyleBoxFlat" id=1] +content_margin_left = 1.0 +bg_color = Color( 0.12549, 0.145098, 0.192157, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=205] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 112, 112, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 152, 223, 223, 223, 151, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 164, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 164, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 164, 222, 222, 222, 164, 222, 222, 222, 199, 223, 223, 223, 163, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 164, 165, 165, 165, 17, 165, 165, 165, 17, 222, 222, 222, 164, 222, 222, 222, 199, 223, 223, 223, 163, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 223, 223, 223, 156, 222, 222, 222, 199, 222, 222, 222, 165, 166, 166, 166, 17, 0, 0, 0, 0, 0, 0, 0, 0, 166, 166, 166, 17, 222, 222, 222, 165, 222, 222, 222, 199, 223, 223, 223, 156, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 222, 222, 222, 154, 222, 222, 222, 159, 166, 166, 166, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166, 166, 166, 18, 222, 222, 222, 159, 222, 222, 222, 154, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 110, 110, 0, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 110, 110, 110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 112, 112, 0, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 222, 222, 222, 150, 223, 223, 223, 152, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 153, 222, 222, 222, 151, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 222, 222, 222, 156, 222, 222, 222, 199, 223, 223, 223, 164, 167, 167, 167, 16, 0, 0, 0, 0, 0, 0, 0, 0, 167, 167, 167, 16, 223, 223, 223, 164, 222, 222, 222, 199, 222, 222, 222, 156, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 165, 165, 165, 17, 222, 222, 222, 164, 222, 222, 222, 199, 223, 223, 223, 163, 167, 167, 167, 16, 167, 167, 167, 16, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 164, 165, 165, 165, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166, 166, 166, 17, 222, 222, 222, 165, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 165, 166, 166, 166, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166, 166, 166, 17, 223, 223, 223, 165, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 165, 166, 166, 166, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166, 166, 166, 18, 222, 222, 222, 153, 222, 222, 222, 153, 166, 166, 166, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 111, 111, 0, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1237,6 +1234,9 @@ border_color = Color( 1, 1, 1, 1 ) shadow_color = Color( 0, 0, 0, 0.3 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=96] +bg_color = Color( 0.12549, 0.145098, 0.192157, 1 ) + [sub_resource type="Image" id=216] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 255, 255, 255, 98, 255, 255, 255, 109, 191, 191, 191, 12, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 12, 255, 255, 255, 109, 255, 255, 255, 98, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 255, 255, 255, 109, 255, 255, 255, 150, 255, 255, 255, 123, 191, 191, 191, 12, 191, 191, 191, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 109, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 13, 255, 255, 255, 124, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 124, 191, 191, 191, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 13, 255, 255, 255, 124, 255, 255, 255, 150, 255, 255, 255, 150, 255, 255, 255, 124, 191, 191, 191, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 13, 255, 255, 255, 115, 255, 255, 255, 115, 191, 191, 191, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1453,7 +1453,6 @@ Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.4715, 0.7015, 1.0465, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 1 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1627,7 +1626,6 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 96 ) Panel/styles/panel = SubResource( 97 ) PanelContainer/styles/panel = SubResource( 98 ) PopupDialog/styles/panel = SubResource( 99 ) @@ -1665,6 +1663,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 117 ) RichTextLabel/styles/normal = SubResource( 47 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 119 ) TabContainer/colors/font_color_bg = Color( 1, 1, 1, 0.3 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -1719,6 +1722,8 @@ ToolButton/styles/pressed = SubResource( 22 ) TooltipLabel/colors/font_color = Color( 0.2, 0.1925, 0.1725, 1 ) TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 ) TooltipPanel/styles/panel = SubResource( 144 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 96 ) Tree/colors/custom_button_font_highlight = Color( 0.88, 0.8845, 0.8965, 1 ) Tree/colors/drop_position_color = Color( 0.41, 0.61, 0.91, 1 ) Tree/colors/font_color = Color( 0.8, 0.8075, 0.8275, 1 ) diff --git a/assets/themes/caramel/theme.tres b/assets/themes/caramel/theme.tres index 2e3e9f192..d27a617c2 100644 --- a/assets/themes/caramel/theme.tres +++ b/assets/themes/caramel/theme.tres @@ -2,13 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.54, 0.43668, 0.3186, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -850,9 +843,6 @@ flags = 0 image = SubResource( 202 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=98] -bg_color = Color( 0.709804, 0.517647, 0.188235, 1 ) - [sub_resource type="StyleBoxFlat" id=99] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1022,6 +1012,13 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=119] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.54, 0.43668, 0.3186, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=208] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 16, 88, 88, 88, 152, 88, 88, 88, 151, 65, 65, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 16, 88, 88, 88, 164, 89, 89, 89, 199, 89, 89, 89, 199, 88, 88, 88, 164, 65, 65, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 66, 66, 16, 89, 89, 89, 163, 89, 89, 89, 199, 88, 88, 88, 164, 88, 88, 88, 164, 89, 89, 89, 199, 89, 89, 89, 163, 66, 66, 66, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 16, 88, 88, 88, 163, 89, 89, 89, 199, 89, 89, 89, 164, 66, 66, 66, 17, 66, 66, 66, 17, 89, 89, 89, 164, 89, 89, 89, 199, 88, 88, 88, 163, 65, 65, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 45, 45, 0, 89, 89, 89, 156, 89, 89, 89, 199, 89, 89, 89, 165, 68, 68, 68, 17, 0, 0, 0, 0, 0, 0, 0, 0, 67, 67, 67, 17, 89, 89, 89, 165, 89, 89, 89, 199, 89, 89, 89, 156, 45, 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 89, 89, 89, 154, 89, 89, 89, 159, 66, 66, 66, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 18, 89, 89, 89, 159, 89, 89, 89, 154, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 45, 45, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 88, 88, 88, 150, 88, 88, 88, 152, 65, 65, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 16, 89, 89, 89, 153, 89, 89, 89, 151, 45, 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 88, 88, 88, 156, 89, 89, 89, 199, 88, 88, 88, 164, 65, 65, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 16, 88, 88, 88, 164, 89, 89, 89, 199, 89, 89, 89, 156, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 65, 65, 17, 89, 89, 89, 164, 89, 89, 89, 199, 89, 89, 89, 163, 66, 66, 66, 16, 66, 66, 66, 16, 89, 89, 89, 163, 89, 89, 89, 199, 88, 88, 88, 164, 65, 65, 65, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 68, 68, 17, 89, 89, 89, 165, 89, 89, 89, 199, 88, 88, 88, 163, 88, 88, 88, 163, 89, 89, 89, 199, 89, 89, 89, 165, 67, 67, 67, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 66, 66, 17, 89, 89, 89, 165, 89, 89, 89, 199, 89, 89, 89, 199, 89, 89, 89, 165, 66, 66, 66, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 66, 66, 18, 88, 88, 88, 153, 88, 88, 88, 153, 66, 66, 66, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 0, 44, 44, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1262,6 +1259,9 @@ border_color = Color( 0, 0, 0, 1 ) shadow_color = Color( 0, 0, 0, 0.1 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=98] +bg_color = Color( 0.709804, 0.517647, 0.188235, 1 ) + [sub_resource type="Image" id=219] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 30, 30, 0, 30, 30, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 30, 30, 0, 30, 30, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 30, 30, 0, 62, 62, 62, 98, 62, 62, 62, 109, 46, 46, 46, 12, 0, 0, 0, 0, 0, 0, 0, 0, 46, 46, 46, 12, 62, 62, 62, 109, 62, 62, 62, 98, 30, 30, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 31, 31, 0, 63, 63, 63, 109, 64, 64, 64, 150, 64, 64, 64, 123, 47, 47, 47, 12, 47, 47, 47, 12, 64, 64, 64, 123, 64, 64, 64, 150, 63, 63, 63, 109, 31, 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 46, 46, 13, 64, 64, 64, 124, 64, 64, 64, 150, 64, 64, 64, 123, 64, 64, 64, 123, 64, 64, 64, 150, 64, 64, 64, 124, 46, 46, 46, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 49, 49, 13, 64, 64, 64, 124, 64, 64, 64, 150, 64, 64, 64, 150, 64, 64, 64, 124, 49, 49, 49, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 13, 64, 64, 64, 115, 64, 64, 64, 115, 48, 48, 48, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 32, 32, 0, 32, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1478,7 +1478,6 @@ Button/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) Button/colors/icon_color_pressed = Color( 3.5, 2.86863, 0.0137255, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 1 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1678,10 +1677,7 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 98 ) Panel/styles/panel = SubResource( 99 ) -Panel/styles/panelf = null -Panel/styles/panelnc = null PanelContainer/styles/panel = SubResource( 100 ) PopupDialog/styles/panel = SubResource( 101 ) PopupMenu/colors/font_color = Color( 0.237305, 0.193295, 0.141827, 1 ) @@ -1721,6 +1717,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 119 ) RichTextLabel/styles/normal = SubResource( 49 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 121 ) TabContainer/colors/font_color_bg = Color( 0, 0, 0, 0.3 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -1807,6 +1808,8 @@ ToolButton/styles/pressed = SubResource( 23 ) TooltipLabel/colors/font_color = Color( 0.762695, 0.806705, 0.858173, 1 ) TooltipLabel/colors/font_color_shadow = Color( 1, 1, 1, 0.1 ) TooltipPanel/styles/panel = SubResource( 147 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 98 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.142383, 0.115977, 0.085096, 1 ) Tree/colors/drop_position_color = Color( 1, 0.819608, 0.00392157, 1 ) diff --git a/assets/themes/dark/theme.tres b/assets/themes/dark/theme.tres index 656747316..b469af6a2 100644 --- a/assets/themes/dark/theme.tres +++ b/assets/themes/dark/theme.tres @@ -2,13 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.2, 0.2, 0.2, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -885,9 +878,6 @@ flags = 0 image = SubResource( 207 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=102] -bg_color = Color( 0.0823529, 0.0823529, 0.0823529, 1 ) - [sub_resource type="StyleBoxFlat" id=103] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1057,6 +1047,13 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=123] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=213] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 152, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 143, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 216, 216, 216, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 164, 222, 222, 222, 199, 222, 222, 222, 143, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 138, 223, 223, 223, 145, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 145, 223, 223, 223, 138, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 124, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 153, 222, 222, 222, 125, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 142, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 142, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 210, 210, 210, 17, 216, 216, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 222, 222, 222, 165, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 154, 223, 223, 223, 154, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1293,6 +1290,9 @@ border_color = Color( 1, 1, 1, 1 ) shadow_color = Color( 0, 0, 0, 0.3 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=102] +bg_color = Color( 0.0823529, 0.0823529, 0.0823529, 1 ) + [sub_resource type="Image" id=224] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 84, 255, 255, 255, 108, 255, 255, 255, 11, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 11, 255, 255, 255, 108, 255, 255, 255, 84, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 100, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 11, 255, 255, 255, 11, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 100, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 122, 255, 255, 255, 122, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 109, 255, 255, 255, 108, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1516,7 +1516,6 @@ Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.211961, 0.45549, 0.613333, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 1 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1724,7 +1723,6 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 102 ) Panel/styles/panel = SubResource( 103 ) Panel/styles/panelf = null Panel/styles/panelnc = null @@ -1767,6 +1765,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 123 ) RichTextLabel/styles/normal = SubResource( 52 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 125 ) TabContainer/colors/font_color_bg = Color( 1, 1, 1, 0.3 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -1856,6 +1859,8 @@ TooltipLabel/constants/shadow_offset_x = 1 TooltipLabel/constants/shadow_offset_y = 1 TooltipLabel/fonts/font = ExtResource( 1 ) TooltipPanel/styles/panel = SubResource( 151 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 102 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.866992, 0.866992, 0.866992, 1 ) Tree/colors/drop_position_color = Color( 0.184314, 0.396078, 0.533333, 1 ) diff --git a/assets/themes/gray/theme.tres b/assets/themes/gray/theme.tres index 9fd2cea21..4bf8a064b 100644 --- a/assets/themes/gray/theme.tres +++ b/assets/themes/gray/theme.tres @@ -2,13 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.2, 0.2, 0.2, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -882,9 +875,6 @@ flags = 0 image = SubResource( 206 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=101] -bg_color = Color( 0.117647, 0.117647, 0.117647, 1 ) - [sub_resource type="StyleBoxFlat" id=102] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1054,6 +1044,13 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=122] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=212] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 152, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 143, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 216, 216, 216, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 164, 222, 222, 222, 199, 222, 222, 222, 143, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 138, 223, 223, 223, 145, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 145, 223, 223, 223, 138, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 124, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 153, 222, 222, 222, 125, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 142, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 142, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 210, 210, 210, 17, 216, 216, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 222, 222, 222, 165, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 154, 223, 223, 223, 154, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1294,6 +1291,9 @@ border_color = Color( 1, 1, 1, 1 ) shadow_color = Color( 0, 0, 0, 0.3 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=101] +bg_color = Color( 0.117647, 0.117647, 0.117647, 1 ) + [sub_resource type="Image" id=223] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 84, 255, 255, 255, 108, 255, 255, 255, 11, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 11, 255, 255, 255, 108, 255, 255, 255, 84, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 100, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 11, 255, 255, 255, 11, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 100, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 122, 255, 255, 255, 122, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 109, 255, 255, 255, 108, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1517,7 +1517,6 @@ Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.0045098, 0.523137, 0.852353, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 1 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1721,10 +1720,7 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 101 ) Panel/styles/panel = SubResource( 102 ) -Panel/styles/panelf = null -Panel/styles/panelnc = null PanelContainer/styles/panel = SubResource( 103 ) PopupDialog/styles/panel = SubResource( 104 ) PopupMenu/colors/font_color = Color( 0.848039, 0.848039, 0.848039, 1 ) @@ -1764,6 +1760,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 122 ) RichTextLabel/styles/normal = SubResource( 51 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 124 ) TabContainer/colors/font_color_bg = Color( 1, 1, 1, 0.3 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -1850,6 +1851,8 @@ ToolButton/styles/pressed = SubResource( 23 ) TooltipLabel/colors/font_color = Color( 0.151961, 0.151961, 0.151961, 1 ) TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 ) TooltipPanel/styles/panel = SubResource( 150 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 101 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.908823, 0.908823, 0.908823, 1 ) Tree/colors/drop_position_color = Color( 0.00392157, 0.454902, 0.741176, 1 ) diff --git a/assets/themes/light/theme.tres b/assets/themes/light/theme.tres index 87bd97849..cbe95981e 100644 --- a/assets/themes/light/theme.tres +++ b/assets/themes/light/theme.tres @@ -2,13 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=5] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.5382, 0.63687, 0.69, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -882,9 +875,6 @@ flags = 0 image = SubResource( 206 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=101] -bg_color = Color( 0.776471, 0.776471, 0.776471, 1 ) - [sub_resource type="StyleBoxFlat" id=102] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1054,6 +1044,13 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=122] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.5382, 0.63687, 0.69, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=212] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 88, 88, 88, 0, 88, 88, 88, 0, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 85, 85, 85, 15, 88, 88, 88, 152, 88, 88, 88, 152, 85, 85, 85, 15, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 85, 85, 85, 15, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 199, 89, 89, 89, 163, 85, 85, 85, 15, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 85, 85, 85, 15, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 163, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 163, 85, 85, 85, 15, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 85, 85, 85, 15, 89, 89, 89, 162, 89, 89, 89, 199, 89, 89, 89, 163, 79, 79, 79, 16, 79, 79, 79, 16, 89, 89, 89, 163, 89, 89, 89, 199, 88, 88, 88, 161, 85, 85, 85, 15, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 89, 89, 0, 89, 89, 89, 143, 89, 89, 89, 199, 88, 88, 88, 164, 90, 90, 90, 17, 84, 84, 84, 0, 84, 84, 84, 0, 90, 90, 90, 17, 88, 88, 88, 164, 89, 89, 89, 199, 89, 89, 89, 143, 89, 89, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 0, 88, 88, 88, 138, 89, 89, 89, 145, 90, 90, 90, 17, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 90, 90, 0, 90, 90, 90, 17, 89, 89, 89, 145, 88, 88, 88, 138, 88, 88, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 0, 89, 89, 89, 0, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 90, 90, 0, 89, 89, 89, 0, 88, 88, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 0, 88, 88, 88, 0, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 90, 90, 90, 0, 89, 89, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 0, 88, 88, 88, 124, 88, 88, 88, 152, 85, 85, 85, 15, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 0, 85, 85, 85, 15, 90, 90, 90, 153, 89, 89, 89, 125, 89, 89, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 89, 89, 0, 89, 89, 89, 142, 89, 89, 89, 199, 89, 89, 89, 163, 85, 85, 85, 15, 85, 85, 85, 0, 85, 85, 85, 0, 85, 85, 85, 15, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 142, 89, 89, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, 79, 79, 0, 79, 79, 79, 16, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 163, 85, 85, 85, 15, 85, 85, 85, 15, 89, 89, 89, 163, 89, 89, 89, 199, 89, 89, 89, 163, 79, 79, 79, 16, 79, 79, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 84, 84, 0, 90, 90, 90, 17, 89, 89, 89, 163, 89, 89, 89, 199, 88, 88, 88, 161, 89, 89, 89, 162, 89, 89, 89, 199, 89, 89, 89, 163, 90, 90, 90, 17, 84, 84, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 90, 90, 0, 90, 90, 90, 17, 89, 89, 89, 165, 89, 89, 89, 199, 89, 89, 89, 199, 88, 88, 88, 164, 90, 90, 90, 17, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 90, 90, 0, 90, 90, 90, 17, 89, 89, 89, 154, 89, 89, 89, 154, 90, 90, 90, 17, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 90, 90, 0, 89, 89, 89, 0, 89, 89, 89, 0, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1294,6 +1291,9 @@ border_color = Color( 0, 0, 0, 1 ) shadow_color = Color( 0, 0, 0, 0.1 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=101] +bg_color = Color( 0.776471, 0.776471, 0.776471, 1 ) + [sub_resource type="Image" id=223] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 0, 46, 46, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 46, 46, 0, 63, 63, 63, 0, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 84, 63, 63, 63, 108, 46, 46, 46, 11, 46, 46, 46, 0, 46, 46, 46, 0, 46, 46, 46, 11, 63, 63, 63, 108, 63, 63, 63, 84, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 100, 64, 64, 64, 150, 64, 64, 64, 123, 46, 46, 46, 11, 46, 46, 46, 11, 64, 64, 64, 123, 64, 64, 64, 150, 63, 63, 63, 100, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 12, 64, 64, 64, 123, 64, 64, 64, 150, 64, 64, 64, 122, 64, 64, 64, 122, 64, 64, 64, 150, 64, 64, 64, 123, 63, 63, 63, 12, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 12, 64, 64, 64, 123, 64, 64, 64, 150, 64, 64, 64, 150, 64, 64, 64, 123, 63, 63, 63, 12, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 12, 63, 63, 63, 109, 63, 63, 63, 108, 63, 63, 63, 12, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 63, 63, 0, 63, 63, 63, 0, 63, 63, 63, 0, 63, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1517,7 +1517,6 @@ Button/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) Button/colors/icon_color_pressed = Color( 0, 1.24902, 3.5, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 5 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1721,10 +1720,7 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 101 ) Panel/styles/panel = SubResource( 102 ) -Panel/styles/panelf = null -Panel/styles/panelnc = null PanelContainer/styles/panel = SubResource( 103 ) PopupDialog/styles/panel = SubResource( 104 ) PopupMenu/colors/font_color = Color( 0.25, 0.25, 0.25, 1 ) @@ -1764,6 +1760,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 122 ) RichTextLabel/styles/normal = SubResource( 51 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 124 ) TabContainer/colors/font_color_bg = Color( 0, 0, 0, 0.3 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -1853,6 +1854,8 @@ ToolButton/styles/pressed = SubResource( 23 ) TooltipLabel/colors/font_color = Color( 0.75, 0.75, 0.75, 1 ) TooltipLabel/colors/font_color_shadow = Color( 1, 1, 1, 0.1 ) TooltipPanel/styles/panel = SubResource( 150 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 101 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.15, 0.15, 0.15, 1 ) Tree/colors/drop_position_color = Color( 0, 0.356863, 1, 1 ) diff --git a/assets/themes/purple/theme.tres b/assets/themes/purple/theme.tres index d40b8c519..4d68fdbfc 100644 --- a/assets/themes/purple/theme.tres +++ b/assets/themes/purple/theme.tres @@ -2,13 +2,6 @@ [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.204595, 0.1247, 0.29, 1 ) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - [sub_resource type="StyleBoxFlat" id=2] content_margin_left = 6.0 content_margin_right = 6.0 @@ -844,13 +837,6 @@ flags = 0 image = SubResource( 201 ) size = Vector2( 12, 12 ) -[sub_resource type="StyleBoxFlat" id=97] -content_margin_left = 6.0 -content_margin_right = 6.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.04202, 0.0252, 0.06, 1 ) - [sub_resource type="StyleBoxFlat" id=98] content_margin_left = 6.0 content_margin_right = 6.0 @@ -1020,6 +1006,13 @@ shadow_size = 4 [sub_resource type="StyleBoxEmpty" id=118] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.204595, 0.1247, 0.29, 1 ) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + [sub_resource type="Image" id=207] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 152, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 143, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 216, 216, 216, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 164, 222, 222, 222, 199, 222, 222, 222, 143, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 138, 223, 223, 223, 145, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 145, 223, 223, 223, 138, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 223, 223, 223, 0, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 223, 223, 223, 0, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 124, 223, 223, 223, 152, 221, 221, 221, 15, 221, 221, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 153, 222, 222, 222, 125, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 222, 0, 222, 222, 222, 142, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 0, 221, 221, 221, 0, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 222, 222, 222, 142, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 223, 223, 0, 223, 223, 223, 16, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 221, 221, 221, 15, 221, 221, 221, 15, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 163, 223, 223, 223, 16, 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 216, 216, 0, 210, 210, 210, 17, 223, 223, 223, 163, 222, 222, 222, 199, 223, 223, 223, 161, 223, 223, 223, 162, 222, 222, 222, 199, 223, 223, 223, 163, 210, 210, 210, 17, 216, 216, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 222, 222, 222, 165, 222, 222, 222, 199, 222, 222, 222, 199, 223, 223, 223, 164, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 210, 210, 210, 17, 223, 223, 223, 154, 223, 223, 223, 154, 210, 210, 210, 17, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, 210, 0, 223, 223, 223, 0, 223, 223, 223, 0, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1247,6 +1240,13 @@ border_color = Color( 1, 1, 1, 1 ) shadow_color = Color( 0, 0, 0, 0.3 ) shadow_size = 4 +[sub_resource type="StyleBoxFlat" id=97] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.04202, 0.0252, 0.06, 1 ) + [sub_resource type="Image" id=218] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 84, 255, 255, 255, 108, 255, 255, 255, 11, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 11, 255, 255, 255, 108, 255, 255, 255, 84, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 100, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 11, 255, 255, 255, 11, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 100, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 122, 255, 255, 255, 122, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 123, 255, 255, 255, 150, 255, 255, 255, 150, 255, 255, 255, 123, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 109, 255, 255, 255, 108, 255, 255, 255, 12, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), @@ -1468,7 +1468,6 @@ Button/colors/font_color_hover = Color( 0.879412, 0.868235, 0.892353, 1 ) Button/colors/font_color_pressed = Color( 0.662745, 0, 1, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.762157, 0, 1.15, 1 ) -Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) Button/styles/hover = SubResource( 4 ) @@ -1636,7 +1635,6 @@ OptionButton/styles/focus = SubResource( 3 ) OptionButton/styles/hover = SubResource( 4 ) OptionButton/styles/normal = SubResource( 5 ) OptionButton/styles/pressed = SubResource( 6 ) -Panel/styles/TopMenu = SubResource( 97 ) Panel/styles/panel = SubResource( 98 ) PanelContainer/styles/panel = SubResource( 99 ) PopupDialog/styles/panel = SubResource( 100 ) @@ -1674,6 +1672,11 @@ RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/styles/focus = SubResource( 118 ) RichTextLabel/styles/normal = SubResource( 47 ) +RulerButton/base_type = "Button" +RulerButton/styles/focus = SubResource( 1 ) +RulerButton/styles/hover = SubResource( 1 ) +RulerButton/styles/normal = SubResource( 1 ) +RulerButton/styles/pressed = SubResource( 1 ) SpinBox/icons/updown = SubResource( 120 ) TabContainer/colors/font_color_bg = Color( 1, 1, 1, 0.3 ) TabContainer/colors/font_color_fg = Color( 0.79902, 0.780392, 0.820588, 1 ) @@ -1722,6 +1725,8 @@ ToolButton/styles/pressed = SubResource( 22 ) TooltipLabel/colors/font_color = Color( 0.20098, 0.219608, 0.179412, 1 ) TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 ) TooltipPanel/styles/panel = SubResource( 145 ) +TopMenuPanel/base_type = "Panel" +TopMenuPanel/styles/panel = SubResource( 97 ) Tree/colors/custom_button_font_highlight = Color( 0.879412, 0.868235, 0.892353, 1 ) Tree/colors/drop_position_color = Color( 0.662745, 0, 1, 1 ) Tree/colors/font_color = Color( 0.79902, 0.780392, 0.820588, 1 ) diff --git a/src/Preferences/HandleThemes.gd b/src/Preferences/HandleThemes.gd index 54a224642..6ce289f47 100644 --- a/src/Preferences/HandleThemes.gd +++ b/src/Preferences/HandleThemes.gd @@ -95,19 +95,6 @@ func change_theme(id: int) -> void: var lbpc_stylebox: StyleBoxFlat = layer_button_pcont.get_stylebox("panel", "PanelContainer") lbpc_stylebox.bg_color = clear_color - # Will no longer be needed when Godot 3.5 is out - var top_menu_style: StyleBox = theme.get_stylebox("TopMenu", "Panel") - var ruler_style: StyleBox = theme.get_stylebox("Ruler", "Button") - Global.top_menu_container.add_stylebox_override("panel", top_menu_style) - Global.horizontal_ruler.add_stylebox_override("normal", ruler_style) - Global.horizontal_ruler.add_stylebox_override("pressed", ruler_style) - Global.horizontal_ruler.add_stylebox_override("hover", ruler_style) - Global.horizontal_ruler.add_stylebox_override("focus", ruler_style) - Global.vertical_ruler.add_stylebox_override("normal", ruler_style) - Global.vertical_ruler.add_stylebox_override("pressed", ruler_style) - Global.vertical_ruler.add_stylebox_override("hover", ruler_style) - Global.vertical_ruler.add_stylebox_override("focus", ruler_style) - change_icon_colors() for child in Global.preferences_dialog.get_node("Popups").get_children(): diff --git a/src/UI/TopMenuContainer.tscn b/src/UI/TopMenuContainer.tscn index d48ab29f9..3097588b3 100644 --- a/src/UI/TopMenuContainer.tscn +++ b/src/UI/TopMenuContainer.tscn @@ -6,6 +6,7 @@ margin_right = 1280.0 margin_bottom = 28.0 rect_min_size = Vector2( 0, 28 ) +theme_type_variation = "TopMenuPanel" script = ExtResource( 2 ) [node name="MenuItems" type="HBoxContainer" parent="."] diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index d9cdf0e5d..0cda4bd01 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -250,6 +250,7 @@ margin_bottom = 58.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 mouse_default_cursor_shape = 14 +theme_type_variation = "RulerButton" action_mode = 0 script = ExtResource( 6 ) @@ -269,6 +270,7 @@ focus_mode = 0 mouse_default_cursor_shape = 15 size_flags_horizontal = 0 size_flags_vertical = 3 +theme_type_variation = "RulerButton" action_mode = 0 script = ExtResource( 4 )