Unify Tab Style + Update Undock Icon

README.md

@@ -27,7 +27,7 @@ choco install material-maker.portable
 Can't wait for next release? Automated builds from master branch are available (use at your own risk):
 
 <a href="https://github.com/RodZill4/material-maker/actions">
-    <img src="https://github.com/RodZill4/material-maker/workflows/dev-desktop-builds/badge.svg" alt="Build Passing" />
+	<img src="https://github.com/RodZill4/material-maker/workflows/dev-desktop-builds/badge.svg" alt="Build Passing" />
 </a>
 
 ## Documentation

addons/flexible_layout/flexible_tab.gd

@@ -1,9 +1,11 @@
 extends Container
 
+# Represents a single tab within a MM_FlexibleLayout.
+# Use Theme Overrides or Theme Files to style it.
 
 var flex_panel : Control
-var updating : bool = false
 
+var updating : bool = false
 
 func _ready():
 	$Container/Close.texture_normal = get_theme_icon("close", "TabBar")

addons/flexible_layout/flexible_tab.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://e06xegp2tp3f"]
 
 [ext_resource type="Script" path="res://addons/flexible_layout/flexible_tab.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://xuy6dfh1rsne" path="res://addons/flexible_layout/undock.png" id="2_nx0qp"]
+[ext_resource type="Texture2D" uid="uid://ixxv8s23pc3e" path="res://addons/flexible_layout/undock.svg" id="2_22txf"]
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_bok24"]
 size = Vector2(16, 16)
@@ -20,6 +20,7 @@ layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
 mouse_filter = 2
+theme_override_constants/separation = 6
 
 [node name="Label" type="Label" parent="Container"]
 layout_mode = 2
@@ -31,7 +32,7 @@ visible = false
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
-texture_normal = ExtResource("2_nx0qp")
+texture_normal = ExtResource("2_22txf")
 
 [node name="Close" type="TextureButton" parent="Container"]
 visible = false

addons/flexible_layout/undock.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ixxv8s23pc3e"
+path="res://.godot/imported/undock.svg-0e462ba8ce32a7b4dbda8774c1ab8185.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/flexible_layout/undock.svg"
+dest_files=["res://.godot/imported/undock.svg-0e462ba8ce32a7b4dbda8774c1ab8185.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

material_maker/theme/birch.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=124 format=3 uid="uid://bnw8qp6oanlqw"]
 
-[ext_resource type="FontFile" path="res://material_maker/theme/font.tres" id="1_jd14k"]
+[ext_resource type="FontFile" uid="uid://bbh5pjbblx75w" path="res://material_maker/theme/font.tres" id="1_jd14k"]
 [ext_resource type="Texture2D" uid="uid://dns037k5om74b" path="res://material_maker/theme/dark/checkbox_checked.png" id="2_47wpj"]
 [ext_resource type="Texture2D" uid="uid://d0jps0u7dybnk" path="res://material_maker/theme/dark/checkbox_radio_checked.png" id="3_umeqq"]
 [ext_resource type="Texture2D" uid="uid://dgy8i2xtjcbox" path="res://material_maker/theme/dark/checkbox_radio_unchecked.png" id="4_pmwt5"]
@@ -850,6 +850,7 @@ LineEdit/styles/normal = SubResource("StyleBoxFlat_a28yg")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_ynapp")
 LinkButton/colors/font_color = Color(0.8275, 0.8165, 0.8, 1)
 LinkButton/styles/focus = SubResource("StyleBoxEmpty_ntbfm")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.8275, 0.8165, 0.8, 1)
 MenuButton/colors/font_color_disabled = Color(1, 1, 1, 0.3)
 MenuButton/colors/font_color_hover = Color(0.8965, 0.8899, 0.88, 1)

material_maker/theme/dark.tres

@@ -57,7 +57,7 @@
 [ext_resource type="Texture2D" uid="uid://rs23woqfg04o" path="res://material_maker/theme/dark/popupmenu_visibility_xray.png" id="55"]
 [ext_resource type="Texture2D" uid="uid://dw0lvt1ip8ifp" path="res://material_maker/theme/dark/popupmenu_submenu.png" id="56"]
 [ext_resource type="Texture2D" uid="uid://c1s6ailuulpow" path="res://material_maker/theme/dark/popupmenu_checked.png" id="57"]
-[ext_resource type="FontFile" path="res://material_maker/theme/font.tres" id="58"]
+[ext_resource type="FontFile" uid="uid://bbh5pjbblx75w" path="res://material_maker/theme/font.tres" id="58"]
 [ext_resource type="FontFile" uid="uid://btybkvkb8rtol" path="res://material_maker/fonts/DroidSansFallback.ttf" id="59"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8ihgd"]
@@ -849,6 +849,7 @@ LineEdit/styles/normal = SubResource("61")
 LineEdit/styles/read_only = SubResource("58")
 LinkButton/colors/font_color = Color(0.787255, 0.787255, 0.787255, 1)
 LinkButton/styles/focus = SubResource("80")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.787255, 0.787255, 0.787255, 1)
 MenuButton/colors/font_disabled_color = Color(1, 1, 1, 0.3)
 MenuButton/colors/font_hover_color = Color(0.872353, 0.872353, 0.872353, 1)

material_maker/theme/default.tres

@@ -838,6 +838,7 @@ LineEdit/styles/normal = SubResource("StyleBoxFlat_e7upo")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_ba0xr")
 LinkButton/colors/font_color = Color(0.8, 0.8075, 0.8275, 1)
 LinkButton/styles/focus = SubResource("StyleBoxEmpty_5hivt")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.8, 0.8075, 0.8275, 1)
 MenuButton/colors/font_color_disabled = Color(1, 1, 1, 0.3)
 MenuButton/colors/font_color_hover = Color(0.88, 0.8845, 0.8965, 1)

material_maker/theme/green.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=124 format=3 uid="uid://madwyufrcvg3"]
 
-[ext_resource type="FontFile" path="res://material_maker/theme/font.tres" id="1_anphx"]
+[ext_resource type="FontFile" uid="uid://bbh5pjbblx75w" path="res://material_maker/theme/font.tres" id="1_anphx"]
 [ext_resource type="Texture2D" uid="uid://dns037k5om74b" path="res://material_maker/theme/dark/checkbox_checked.png" id="2_vx81v"]
 [ext_resource type="Texture2D" uid="uid://d0jps0u7dybnk" path="res://material_maker/theme/dark/checkbox_radio_checked.png" id="3_ehkys"]
 [ext_resource type="Texture2D" uid="uid://dgy8i2xtjcbox" path="res://material_maker/theme/dark/checkbox_radio_unchecked.png" id="4_orvtq"]
@@ -850,6 +850,7 @@ LineEdit/styles/normal = SubResource("StyleBoxFlat_1beoj")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_sgfku")
 LinkButton/colors/font_color = Color(0.8055, 0.8275, 0.8, 1)
 LinkButton/styles/focus = SubResource("StyleBoxEmpty_2auyi")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.8055, 0.8275, 0.8, 1)
 MenuButton/colors/font_color_disabled = Color(1, 1, 1, 0.3)
 MenuButton/colors/font_color_hover = Color(0.8833, 0.8965, 0.88, 1)

material_maker/theme/light.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=126 format=3 uid="uid://d12pe6icsioje"]
 
-[ext_resource type="FontFile" path="res://material_maker/theme/font.tres" id="1_ib7yq"]
+[ext_resource type="FontFile" uid="uid://bbh5pjbblx75w" path="res://material_maker/theme/font.tres" id="1_ib7yq"]
 [ext_resource type="Texture2D" uid="uid://bg66nf03a1wj0" path="res://material_maker/theme/light/checkbox_checked.png" id="2_cx70j"]
 [ext_resource type="Texture2D" uid="uid://ctamubqvnfppj" path="res://material_maker/theme/light/checkbox_radio_checked.png" id="3_gmi3y"]
 [ext_resource type="Texture2D" uid="uid://8ulk7ii706l4" path="res://material_maker/theme/light/checkbox_radio_unchecked.png" id="4_6qsc0"]
@@ -905,6 +905,7 @@ LineEdit/styles/normal = SubResource("StyleBoxFlat_4qnsg")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_mt288")
 LinkButton/colors/font_color = Color(0.212745, 0.212745, 0.212745, 1)
 LinkButton/styles/focus = SubResource("StyleBoxEmpty_yjk8e")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.212745, 0.212745, 0.212745, 1)
 MenuButton/colors/font_disabled_color = Color(0, 0, 0, 0.3)
 MenuButton/colors/font_hover_color = Color(0.127647, 0.127647, 0.127647, 1)

material_maker/theme/mangosteen.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=124 format=3 uid="uid://c8isn6xerh652"]
 
-[ext_resource type="FontFile" path="res://material_maker/theme/font.tres" id="1_xi23j"]
+[ext_resource type="FontFile" uid="uid://bbh5pjbblx75w" path="res://material_maker/theme/font.tres" id="1_xi23j"]
 [ext_resource type="Texture2D" uid="uid://dns037k5om74b" path="res://material_maker/theme/dark/checkbox_checked.png" id="2_1tmpj"]
 [ext_resource type="Texture2D" uid="uid://d0jps0u7dybnk" path="res://material_maker/theme/dark/checkbox_radio_checked.png" id="3_fgb41"]
 [ext_resource type="Texture2D" uid="uid://dgy8i2xtjcbox" path="res://material_maker/theme/dark/checkbox_radio_unchecked.png" id="4_6dxbb"]
@@ -850,6 +850,7 @@ LineEdit/styles/normal = SubResource("StyleBoxFlat_ywaco")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_4xl1u")
 LinkButton/colors/font_color = Color(0.8275, 0.8, 0.8165, 1)
 LinkButton/styles/focus = SubResource("StyleBoxEmpty_urbbl")
+MM_FlexibleTab/base_type = &"TabBar"
 MenuButton/colors/font_color = Color(0.8275, 0.8, 0.8165, 1)
 MenuButton/colors/font_color_disabled = Color(1, 1, 1, 0.3)
 MenuButton/colors/font_color_hover = Color(0.8965, 0.88, 0.8899, 1)