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 pull request #1 from Orama-Interactive/master

Browse source 
Updated fix for #53 to only work on 3.1.x
This commit is contained in:
Schweini07 2020-01-01 15:58:52 +01:00 committed by GitHub
parent f7ba68b5fc d917eb06de
commit e61fea32bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Dialogs/PreferencesDialog.gd
View file

@ -74,6 +74,10 @@ func _on_Language_pressed(button : Button) -> void:
Global.config_cache.set_value("preferences", "locale", TranslationServer.get_locale())
Global.config_cache.save("user://cache.ini")
# Update Translations
_on_PreferencesDialog_popup_hide()
_on_PreferencesDialog_about_to_show()
func _on_Theme_pressed(button : Button) -> void:
var index := 0
var i := 0

6
Scripts/Main.gd
View file

@ -149,8 +149,10 @@ func _ready() -> void:
for t in tools:
t[0].connect("pressed", self, "_on_Tool_pressed", [t[0]])
Global.left_color_picker.get_picker().move_child(Global.left_color_picker.get_picker().get_child(0), 1)
Global.right_color_picker.get_picker().move_child(Global.right_color_picker.get_picker().get_child(0), 1)
# Checks to see if it's 3.1.x
if Engine.get_version_info().major == 3 && Engine.get_version_info().minor < 2:
Global.left_color_picker.get_picker().move_child(Global.left_color_picker.get_picker().get_child(0), 1)
Global.right_color_picker.get_picker().move_child(Global.right_color_picker.get_picker().get_child(0), 1)
Import.import_brushes("Brushes")