tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 13:54:44 -04:00
Code Issues Projects Releases Wiki Activity

Theme edits (#342)

Browse source 
* Theme edits

Changed all the themes to be more consistent, buttons and panel containers have rounded edges. Note that the spacings have been switched too, so it needs subtle remakes in the placing of each element. Especially the tool buttons. Also check the themes on preferences (need better spacing) and rulers are not included.

* Some UI fixes

* Reduced size of themes

* Fixed more spacing issues and replaced timeline grabber icon

* Removed old theme icons

* Change purple and light rulers

* Fix purple top menu & caramel rulers

Co-authored-by: Erevoid <Erevoid@users.noreply.github.com>
Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
This commit is contained in:
Erevos 2020-09-29 18:00:43 +03:00 • committed by GitHub
parent da24133a4d
commit 41a9107c45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 13449 additions and 12179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/UI/BrushButton.tscn
View file

@ -17,6 +17,8 @@ margin_bottom = 32.0
rect_min_size = Vector2( 32, 32 )
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 1 )
custom_styles/focus = SubResource( 1 )
custom_styles/disabled = SubResource( 1 )
custom_styles/normal = SubResource( 1 )
button_mask = 7
script = ExtResource( 2 )

19
src/UI/PatternButton.tscn
View file

@ -1,7 +1,16 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2]
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 1, 1, 1, 1 )
border_color = Color( 1, 1, 1, 1 )
corner_radius_top_left = 5
corner_radius_top_right = 5
corner_radius_bottom_right = 5
corner_radius_bottom_left = 5
anti_aliasing = false
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 1, 1, 1, 1 )
border_color = Color( 1, 1, 1, 1 )
@ -15,9 +24,11 @@ anti_aliasing = false
margin_right = 32.0
margin_bottom = 32.0
rect_min_size = Vector2( 32, 32 )
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 1 )
custom_styles/normal = SubResource( 1 )
custom_styles/hover = SubResource( 2 )
custom_styles/pressed = SubResource( 2 )
custom_styles/focus = SubResource( 1 )
custom_styles/disabled = SubResource( 1 )
custom_styles/normal = SubResource( 2 )
button_mask = 7
script = ExtResource( 2 )

8
src/UI/Timeline/AnimationTimeline.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=44 format=2]
[gd_scene load_steps=43 format=2]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1]
[ext_resource path="res://assets/graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
@ -7,7 +7,6 @@
[ext_resource path="res://assets/graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
[ext_resource path="res://assets/graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
[ext_resource path="res://assets/graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
[ext_resource path="res://assets/themes/dark/icons/vsplit.png" type="Texture" id=8]
[ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18]
[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
@ -759,9 +758,9 @@ rect_min_size = Vector2( 214, 0 )
[node name="OpacityLabel" type="Label" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"]
margin_right = 53.0
margin_bottom = 32.0
margin_bottom = 14.0
size_flags_horizontal = 0
size_flags_vertical = 1
size_flags_vertical = 0
text = "Opacity:"
valign = 1
@ -930,7 +929,6 @@ margin_top = -6.0
margin_right = 24.0
margin_bottom = -4.76837e-07
mouse_filter = 2
texture = ExtResource( 8 )
__meta__ = {
"_edit_use_anchors_": false
}

10
src/UI/Timeline/LayerButton.tscn
View file

@ -26,8 +26,12 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="EmptySpacer" type="Control" parent="HBoxContainer"]
margin_bottom = 36.0
[node name="LayerButtons" type="HBoxContainer" parent="HBoxContainer"]
margin_right = 104.0
margin_left = 4.0
margin_right = 108.0
margin_bottom = 36.0
[node name="VisibilityButton" type="Button" parent="HBoxContainer/LayerButtons" groups=[
@ -122,8 +126,8 @@ __meta__ = {
}
[node name="LayerName" type="HBoxContainer" parent="HBoxContainer"]
margin_left = 108.0
margin_right = 212.0
margin_left = 112.0
margin_right = 216.0
margin_bottom = 36.0
rect_min_size = Vector2( 104, 0 )
mouse_default_cursor_shape = 2

22
src/UI/TopMenuContainer.tscn
View file

@ -21,7 +21,7 @@ __meta__ = {
[node name="FileMenu" type="MenuButton" parent="MenuItems"]
margin_right = 35.0
margin_bottom = 20.0
margin_bottom = 23.0
mouse_default_cursor_shape = 2
text = "File"
switch_on_hover = true
@ -29,7 +29,7 @@ switch_on_hover = true
[node name="EditMenu" type="MenuButton" parent="MenuItems"]
margin_left = 39.0
margin_right = 75.0
margin_bottom = 20.0
margin_bottom = 23.0
mouse_default_cursor_shape = 2
text = "Edit"
switch_on_hover = true
@ -37,7 +37,7 @@ switch_on_hover = true
[node name="ViewMenu" type="MenuButton" parent="MenuItems"]
margin_left = 79.0
margin_right = 121.0
margin_bottom = 20.0
margin_bottom = 23.0
mouse_default_cursor_shape = 2
text = "View"
switch_on_hover = true
@ -45,7 +45,7 @@ switch_on_hover = true
[node name="ImageMenu" type="MenuButton" parent="MenuItems"]
margin_left = 125.0
margin_right = 177.0
margin_bottom = 20.0
margin_bottom = 23.0
mouse_default_cursor_shape = 2
text = "Image"
switch_on_hover = true
@ -53,7 +53,7 @@ switch_on_hover = true
[node name="HelpMenu" type="MenuButton" parent="MenuItems"]
margin_left = 181.0
margin_right = 223.0
margin_bottom = 20.0
margin_bottom = 23.0
mouse_default_cursor_shape = 2
text = "Help"
switch_on_hover = true
@ -91,10 +91,10 @@ anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
margin_left = -330.0
margin_top = -14.0
margin_bottom = 14.0
margin_top = -10.0
margin_right = 0.00012207
margin_bottom = 13.0
grow_horizontal = 2
size_flags_vertical = 0
alignment = 1
__meta__ = {
"_edit_use_anchors_": false
@ -103,10 +103,9 @@ __meta__ = {
[node name="CurrentFrame" type="Label" parent="HBoxContainer"]
margin_left = 106.0
margin_right = 198.0
margin_bottom = 28.0
margin_bottom = 23.0
size_flags_vertical = 1
text = "Current frame:"
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
@ -114,7 +113,6 @@ __meta__ = {
[node name="CurrentFrameMark" type="Label" parent="HBoxContainer"]
margin_left = 202.0
margin_right = 223.0
margin_bottom = 28.0
margin_bottom = 23.0
size_flags_vertical = 1
text = "1/2"
valign = 1

8
src/UI/UI.tscn
View file

@ -48,8 +48,10 @@ size_flags_vertical = 3
anchor_left = 0.5
anchor_right = 0.5
margin_left = -20.5
margin_right = 20.5
margin_bottom = 254.0
margin_right = -6.5
margin_bottom = 14.0
size_flags_horizontal = 0
size_flags_vertical = 0
__meta__ = {
"_edit_use_anchors_": false
}
@ -59,6 +61,8 @@ margin_left = 7.0
margin_top = 7.0
margin_right = 39.0
margin_bottom = 255.0
size_flags_horizontal = 4
size_flags_vertical = 0
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false