Big UI overhaul - added PanelContainers to group similar elements

Removed separators entirely. Also made the AnimationTimeline have a StyleBoxFlat of its own, which we use to expand its margin top to cover the little space left because of the VSplitContainer. We also use a TextureRect as a fake VSplitContainer grabber.
This commit is contained in:
OverloadedOrama 2020-05-06 00:55:17 +03:00
parent 7559756c50
commit c1602ad26a
9 changed files with 648 additions and 501 deletions

View file

@ -1,4 +1,4 @@
[gd_resource type="Theme" load_steps=35 format=2]
[gd_resource type="Theme" load_steps=36 format=2]
[ext_resource path="res://assets/themes/light/icons/hsplit.png" type="Texture" id=1]
[ext_resource path="res://assets/themes/light/icons/grabber.png" type="Texture" id=2]
@ -168,6 +168,17 @@ anti_aliasing = false
bg_color = Color( 0.854902, 0.74902, 0.494118, 1 )
[sub_resource type="StyleBoxFlat" id=19]
content_margin_left = 4.5
content_margin_right = 4.5
content_margin_top = 3.0
content_margin_bottom = 3.0
bg_color = Color( 0.694118, 0.619608, 0.458824, 1 )
corner_radius_top_left = 5
corner_radius_top_right = 5
corner_radius_bottom_right = 5
corner_radius_bottom_left = 5
[sub_resource type="StyleBoxFlat" id=20]
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
border_width_left = 6
border_width_top = 10
@ -180,10 +191,10 @@ corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
anti_aliasing = false
[sub_resource type="StyleBoxFlat" id=20]
[sub_resource type="StyleBoxFlat" id=21]
bg_color = Color( 0.219608, 0.211765, 0.168627, 1 )
[sub_resource type="StyleBoxFlat" id=21]
[sub_resource type="StyleBoxFlat" id=22]
bg_color = Color( 1, 0.898039, 0.501961, 1 )
border_width_left = 5
border_width_top = 10
@ -196,7 +207,7 @@ corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
anti_aliasing = false
[sub_resource type="StyleBoxFlat" id=22]
[sub_resource type="StyleBoxFlat" id=23]
bg_color = Color( 0.545098, 0.384314, 0, 1 )
border_width_left = 10
border_width_top = 6
@ -204,7 +215,7 @@ border_width_right = 10
border_width_bottom = 8
border_color = Color( 0.545098, 0.384314, 0, 1 )
[sub_resource type="StyleBoxFlat" id=23]
[sub_resource type="StyleBoxFlat" id=24]
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
border_width_left = 10
border_width_top = 6
@ -212,7 +223,7 @@ border_width_right = 10
border_width_bottom = 8
border_color = Color( 0.145098, 0.145098, 0.164706, 1 )
[sub_resource type="StyleBoxFlat" id=24]
[sub_resource type="StyleBoxFlat" id=25]
bg_color = Color( 1, 0.898039, 0.501961, 1 )
border_width_left = 10
border_width_top = 6
@ -220,19 +231,6 @@ border_width_right = 10
border_width_bottom = 8
border_color = Color( 1, 0.898039, 0.501961, 1 )
[sub_resource type="StyleBoxFlat" id=25]
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
border_width_left = 4
border_width_top = 4
border_width_right = 4
border_width_bottom = 4
border_color = Color( 0.588235, 0.568627, 0.470588, 1 )
corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
anti_aliasing = false
[sub_resource type="StyleBoxFlat" id=26]
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
border_width_left = 4
@ -244,8 +242,21 @@ corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
anti_aliasing = false
[sub_resource type="StyleBoxFlat" id=27]
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
border_width_left = 4
border_width_top = 4
border_width_right = 4
border_width_bottom = 4
border_color = Color( 0.588235, 0.568627, 0.470588, 1 )
corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
[sub_resource type="StyleBoxFlat" id=28]
bg_color = Color( 0.445313, 0.432846, 0.370514, 1 )
border_width_left = 5
border_width_right = 5
@ -255,13 +266,13 @@ corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
[sub_resource type="StyleBoxFlat" id=28]
[sub_resource type="StyleBoxFlat" id=29]
bg_color = Color( 0.372549, 0.360784, 0.301961, 1 )
border_width_left = 2
border_width_right = 2
border_color = Color( 0.552941, 0.376471, 0, 1 )
[sub_resource type="StyleBoxFlat" id=29]
[sub_resource type="StyleBoxFlat" id=30]
bg_color = Color( 0.901961, 0.866667, 0.670588, 1 )
border_width_left = 2
border_width_top = 20
@ -403,6 +414,7 @@ OptionButton/styles/pressed = null
Panel/styles/panel = SubResource( 18 )
Panel/styles/panelf = null
Panel/styles/panelnc = null
PanelContainer/styles/panel = SubResource( 19 )
PopupMenu/colors/font_color = Color( 0, 0, 0, 1 )
PopupMenu/colors/font_color_accel = Color( 0.701961, 0.701961, 0.701961, 0.8 )
PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
@ -418,10 +430,10 @@ PopupMenu/icons/unchecked = null
PopupMenu/styles/hover = null
PopupMenu/styles/labeled_separator_left = null
PopupMenu/styles/labeled_separator_right = null
PopupMenu/styles/panel = SubResource( 19 )
PopupMenu/styles/panel = SubResource( 20 )
PopupMenu/styles/panel_disabled = null
PopupMenu/styles/separator = null
PopupPanel/styles/panel = SubResource( 20 )
PopupPanel/styles/panel = SubResource( 21 )
SpinBox/icons/updown = null
TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 )
TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
@ -438,10 +450,10 @@ TabContainer/icons/increment = null
TabContainer/icons/increment_highlight = null
TabContainer/icons/menu = null
TabContainer/icons/menu_highlight = null
TabContainer/styles/panel = SubResource( 21 )
TabContainer/styles/tab_bg = SubResource( 22 )
TabContainer/styles/tab_disabled = SubResource( 23 )
TabContainer/styles/tab_fg = SubResource( 24 )
TabContainer/styles/panel = SubResource( 22 )
TabContainer/styles/tab_bg = SubResource( 23 )
TabContainer/styles/tab_disabled = SubResource( 24 )
TabContainer/styles/tab_fg = SubResource( 25 )
Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 )
Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 )
@ -457,10 +469,10 @@ Tabs/icons/increment = null
Tabs/icons/increment_highlight = null
Tabs/styles/button = null
Tabs/styles/button_pressed = null
Tabs/styles/panel = SubResource( 21 )
Tabs/styles/tab_bg = SubResource( 22 )
Tabs/styles/tab_disabled = SubResource( 23 )
Tabs/styles/tab_fg = SubResource( 24 )
Tabs/styles/panel = SubResource( 22 )
Tabs/styles/tab_bg = SubResource( 23 )
Tabs/styles/tab_disabled = SubResource( 24 )
Tabs/styles/tab_fg = SubResource( 25 )
TextEdit/colors/background_color = Color( 0, 0, 0, 0 )
TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 )
TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 )
@ -492,7 +504,7 @@ TextEdit/fonts/font = null
TextEdit/icons/tab = null
TextEdit/styles/completion = null
TextEdit/styles/focus = null
TextEdit/styles/normal = SubResource( 25 )
TextEdit/styles/normal = SubResource( 26 )
TextEdit/styles/read_only = null
Tree/colors/cursor_color = Color( 0, 0, 0, 1 )
Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 )
@ -520,7 +532,7 @@ Tree/icons/checked = null
Tree/icons/select_arrow = null
Tree/icons/unchecked = null
Tree/icons/updown = null
Tree/styles/bg = SubResource( 26 )
Tree/styles/bg = SubResource( 27 )
Tree/styles/bg_focus = null
Tree/styles/button_pressed = null
Tree/styles/cursor = null
@ -541,10 +553,10 @@ VScrollBar/icons/increment_highlight = null
VScrollBar/styles/grabber = SubResource( 10 )
VScrollBar/styles/grabber_highlight = SubResource( 11 )
VScrollBar/styles/grabber_pressed = SubResource( 12 )
VScrollBar/styles/scroll = SubResource( 27 )
VScrollBar/styles/scroll = SubResource( 28 )
VScrollBar/styles/scroll_focus = null
VSeparator/constants/separation = 4
VSeparator/styles/separator = SubResource( 28 )
VSeparator/styles/separator = SubResource( 29 )
VSplitContainer/constants/autohide = 1
VSplitContainer/constants/separation = 6
VSplitContainer/icons/grabber = ExtResource( 4 )
@ -557,4 +569,4 @@ WindowDialog/constants/title_height = 20
WindowDialog/fonts/title_font = null
WindowDialog/icons/close = null
WindowDialog/icons/close_highlight = null
WindowDialog/styles/panel = SubResource( 29 )
WindowDialog/styles/panel = SubResource( 30 )