huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Merge branch 'master' into palette_updates

Browse source
This commit is contained in:
CheetoHead 2019-12-16 20:36:06 -05:00
parent b094c6595f 95f6f29b9c
commit 97efa20055
5 changed files with 327 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

292
Main.tscn
View file

File diff suppressed because one or more lines are too long

32
Prefabs/FrameButton.tscn
View file

@ -1,27 +1,7 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=1]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.337255, 0.32549, 0.388235, 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]
bg_color = Color( 0.211765, 0.2, 0.247059, 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=3]
bg_color = Color( 0.270588, 0.258824, 0.305882, 1 )
corner_radius_top_left = 2
corner_radius_top_right = 2
corner_radius_bottom_right = 2
corner_radius_bottom_left = 2
[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=2]
[node name="Frame" type="VBoxContainer"]
margin_right = 32.0
@ -34,12 +14,10 @@ rect_min_size = Vector2( 36, 36 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
theme = ExtResource( 1 )
toggle_mode = true
button_mask = 3
script = ExtResource( 1 )
script = ExtResource( 2 )
[node name="FrameTexture" type="TextureRect" parent="FrameButton"]
margin_left = 2.0

28
Prefabs/LayerContainer.tscn
View file

@ -1,26 +1,16 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=2]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.337255, 0.32549, 0.388235, 1 )
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.211765, 0.2, 0.247059, 1 )
[sub_resource type="StyleBoxFlat" id=3]
bg_color = Color( 0.270588, 0.258824, 0.305882, 1 )
[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=2]
[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=3]
[node name="LayerContainer" type="Button"]
margin_right = 160.0
margin_bottom = 42.0
rect_min_size = Vector2( 160, 42 )
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
theme = ExtResource( 1 )
toggle_mode = true
script = ExtResource( 1 )
script = ExtResource( 2 )
__meta__ = {
"_edit_horizontal_guides_": [ ]
}
@ -34,7 +24,7 @@ hint_tooltip = "LAYERVISIBILITY_HT"
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 2 )
texture_normal = ExtResource( 3 )
[node name="HBoxContainer" type="HBoxContainer" parent="."]
anchor_left = 0.5
@ -57,8 +47,8 @@ stretch_mode = 6
[node name="Label" type="Label" parent="HBoxContainer"]
margin_left = 36.0
margin_top = 9.0
margin_right = 82.0
margin_top = 8.0
margin_right = 75.0
margin_bottom = 23.0
text = "Layer 0"
align = 1

4
Scripts/HorizontalRuler.gd
View file

@ -14,9 +14,9 @@ func _process(delta : float) -> void:
update()
var mouse_pos := get_local_mouse_position()
if mouse_pos.x < RULER_WIDTH: #For double guides
mouse_default_cursor_shape = Control.CURSOR_BDIAGSIZE
mouse_default_cursor_shape = Control.CURSOR_FDIAGSIZE
else:
mouse_default_cursor_shape = Control.CURSOR_HSPLIT
mouse_default_cursor_shape = Control.CURSOR_VSPLIT
#Code taken and modified from Godot's source code
func _draw() -> void:

164
Themes & Styles/Main Theme.tres
View file

@ -1,8 +1,170 @@
[gd_resource type="Theme" load_steps=2 format=2]
[gd_resource type="Theme" load_steps=14 format=2]
[ext_resource path="res://Assets/Fonts/Roboto-Regular.tres" type="DynamicFont" id=1]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.517647, 0.517647, 0.517647, 1 )
border_width_left = 6
border_width_top = 4
border_width_right = 6
border_width_bottom = 4
border_color = Color( 0.517647, 0.517647, 0.517647, 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=2]
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
border_width_left = 6
border_width_top = 4
border_width_right = 6
border_width_bottom = 4
border_color = Color( 0.321569, 0.321569, 0.321569, 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=3]
bg_color = Color( 0.2, 0.2, 0.2, 1 )
border_width_left = 6
border_width_top = 4
border_width_right = 6
border_width_bottom = 4
border_color = Color( 0.2, 0.2, 0.2, 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=4]
bg_color = Color( 0.6, 0.6, 0.6, 0 )
[sub_resource type="StyleBoxFlat" id=5]
bg_color = Color( 0.6, 0.6, 0.6, 0 )
[sub_resource type="StyleBoxFlat" id=6]
bg_color = Color( 0.6, 0.6, 0.6, 0 )
[sub_resource type="StyleBoxFlat" id=7]
bg_color = Color( 0.6, 0.6, 0.6, 0 )
[sub_resource type="StyleBoxFlat" id=12]
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
border_width_left = 8
border_width_top = 1
border_width_right = 4
border_width_bottom = 1
border_color = Color( 0.321569, 0.321569, 0.321569, 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=8]
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
border_width_left = 5
border_width_top = 10
border_width_right = 5
border_width_bottom = 5
border_color = Color( 0.321569, 0.321569, 0.321569, 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=9]
bg_color = Color( 0.2, 0.2, 0.2, 1 )
border_width_left = 10
border_width_top = 6
border_width_right = 10
border_width_bottom = 8
border_color = Color( 0.2, 0.2, 0.2, 1 )
[sub_resource type="StyleBoxFlat" id=10]
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
border_width_left = 10
border_width_top = 6
border_width_right = 10
border_width_bottom = 8
border_color = Color( 0.145098, 0.145098, 0.164706, 1 )
[sub_resource type="StyleBoxFlat" id=11]
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
border_width_left = 10
border_width_top = 6
border_width_right = 10
border_width_bottom = 8
border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
[resource]
default_font = ExtResource( 1 )
Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 )
Button/colors/font_color_pressed = Color( 1, 1, 1, 1 )
Button/constants/hseparation = 2
Button/fonts/font = null
Button/styles/disabled = null
Button/styles/focus = null
Button/styles/hover = SubResource( 1 )
Button/styles/normal = SubResource( 2 )
Button/styles/pressed = SubResource( 3 )
CheckBox/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
CheckBox/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 )
CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 )
CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 )
CheckBox/constants/check_vadjust = 0
CheckBox/constants/hseparation = 4
CheckBox/fonts/font = null
CheckBox/icons/checked = null
CheckBox/icons/radio_checked = null
CheckBox/icons/radio_unchecked = null
CheckBox/icons/unchecked = null
CheckBox/styles/disabled = null
CheckBox/styles/focus = null
CheckBox/styles/hover = SubResource( 4 )
CheckBox/styles/hover_pressed = SubResource( 5 )
CheckBox/styles/normal = SubResource( 6 )
CheckBox/styles/pressed = SubResource( 7 )
GridContainer/constants/hseparation = 0
GridContainer/constants/vseparation = 0
LineEdit/colors/clear_button_color = Color( 0.878431, 0.878431, 0.878431, 1 )
LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 )
LineEdit/colors/cursor_color = Color( 0.941176, 0.941176, 0.941176, 1 )
LineEdit/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 )
LineEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 )
LineEdit/constants/minimum_spaces = 12
LineEdit/fonts/font = null
LineEdit/icons/clear = null
LineEdit/styles/focus = null
LineEdit/styles/normal = SubResource( 12 )
LineEdit/styles/read_only = null
TabContainer/colors/font_color_bg = Color( 0.690196, 0.690196, 0.690196, 1 )
TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
TabContainer/colors/font_color_fg = Color( 0.941176, 0.941176, 0.941176, 1 )
TabContainer/constants/hseparation = 4
TabContainer/constants/label_valign_bg = 2
TabContainer/constants/label_valign_fg = 0
TabContainer/constants/side_margin = 8
TabContainer/constants/top_margin = 24
TabContainer/fonts/font = null
TabContainer/icons/decrement = null
TabContainer/icons/decrement_highlight = null
TabContainer/icons/increment = null
TabContainer/icons/increment_highlight = null
TabContainer/icons/menu = null
TabContainer/icons/menu_highlight = null
TabContainer/styles/panel = SubResource( 8 )
TabContainer/styles/tab_bg = SubResource( 9 )
TabContainer/styles/tab_disabled = SubResource( 10 )
TabContainer/styles/tab_fg = SubResource( 11 )
VBoxContainer/constants/separation = 4