From 096a81d61ce189261244abdde0a575923efc02d8 Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 13 Mar 2020 18:47:16 +0100 Subject: [PATCH 1/2] Fix #167 --- Main.tscn | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Main.tscn b/Main.tscn index 65e9eb587..b65086bf7 100644 --- a/Main.tscn +++ b/Main.tscn @@ -116,6 +116,9 @@ __meta__ = { anchor_right = 1.0 anchor_bottom = 1.0 custom_constants/separation = 0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="TopMenuContainer" type="Panel" parent="MenuAndUI"] margin_right = 1152.0 @@ -987,6 +990,7 @@ script = ExtResource( 15 ) margin_left = 16.0 margin_right = 692.0 margin_bottom = 392.0 +focus_mode = 1 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true @@ -1222,6 +1226,7 @@ columns = 5 [node name="SplashDialog" parent="." instance=ExtResource( 27 )] [node name="CreateNewImage" parent="." instance=ExtResource( 28 )] +window_title = "Please Confirm..." [node name="OpenSprite" type="FileDialog" parent="."] margin_right = 515.0 @@ -1231,8 +1236,8 @@ resizable = true mode = 0 access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" -current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" +current_dir = "/home/marco/Pixelorama" +current_path = "/home/marco/Pixelorama/" [node name="SaveSprite" type="FileDialog" parent="."] anchor_left = 0.5 @@ -1247,27 +1252,35 @@ window_title = "Save Sprite as .pxo" resizable = true access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" -current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" +current_dir = "/home/marco/Pixelorama" +current_path = "/home/marco/Pixelorama/" [node name="ImportSprites" parent="." instance=ExtResource( 29 )] +current_dir = "/home/marco/Pixelorama" +current_path = "/home/marco/Pixelorama/" [node name="ExportSprites" parent="." instance=ExtResource( 30 )] +current_dir = "/home/marco/Pixelorama" +current_path = "/home/marco/Pixelorama/" [node name="ScaleImage" parent="." instance=ExtResource( 31 )] +window_title = "Please Confirm..." [node name="PreferencesDialog" parent="." instance=ExtResource( 32 )] [node name="RotateImage" parent="." instance=ExtResource( 38 )] +window_title = "Please Confirm..." [node name="OutlineDialog" parent="." instance=ExtResource( 33 )] visible = false +window_title = "Please Confirm..." [node name="AboutDialog" parent="." instance=ExtResource( 34 )] [node name="QuitDialog" type="ConfirmationDialog" parent="."] margin_right = 200.0 margin_bottom = 70.0 +window_title = "Please Confirm..." resizable = true dialog_text = "Are you sure you want to exit Pixelorama?" @@ -1293,8 +1306,8 @@ dialog_text = "This is an error message!" [node name="PaletteImportFileDialog" parent="." instance=ExtResource( 37 )] filters = PoolStringArray( "*.json ; JavaScript Object Notation", "*.gpl ; Gimp Palette Library", "*.png; Portable Network Graphics" ) -current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" -current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" +current_dir = "/home/marco/Pixelorama" +current_path = "/home/marco/Pixelorama/" [node name="LeftCursor" type="Sprite" parent="."] visible = false From 54ed08357d22855c28398dd420b5303df83d16c5 Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 13 Mar 2020 19:51:39 +0100 Subject: [PATCH 2/2] LineEdit release focus on Enter key pressed --- Main.tscn | 5 ++++- Scripts/Main.gd | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Main.tscn b/Main.tscn index b65086bf7..48b1c6ff1 100644 --- a/Main.tscn +++ b/Main.tscn @@ -990,7 +990,7 @@ script = ExtResource( 15 ) margin_left = 16.0 margin_right = 692.0 margin_bottom = 392.0 -focus_mode = 1 +focus_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true @@ -1048,6 +1048,9 @@ rect_min_size = Vector2( 224, 0 ) anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 16.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="CanvasPreview" type="ViewportContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes"] margin_right = 224.0 diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 86b544b6d..b61e70b4a 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -189,6 +189,11 @@ func _input(event : InputEvent) -> void: Global.left_cursor.texture = Global.left_cursor_tool_texture Global.right_cursor.position = get_global_mouse_position() + Vector2(32, 32) Global.right_cursor.texture = Global.right_cursor_tool_texture + + if event is InputEventKey && (event.scancode == KEY_ENTER || event.scancode == KEY_KP_ENTER): + if get_focus_owner() is LineEdit: + get_focus_owner().release_focus() + if event.is_action_pressed("toggle_fullscreen"): OS.window_fullscreen = !OS.window_fullscreen