Skip to content

Commit

Permalink
Fixed problems in Material Maker addon for Godot
Browse files Browse the repository at this point in the history
Icon and settings taken from the project
  • Loading branch information
RodZill4 committed Sep 12, 2018
1 parent e4aebb9 commit 9bdcb73
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
Binary file added addons/material_maker/icons/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion addons/material_maker/main_window.gd
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ const MENU = [
signal quit

func _ready():
OS.set_window_title(ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release"))
if !Engine.editor_hint:
OS.set_window_title(ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release"))
for m in $VBoxContainer/Menu.get_children():
var menu = m.get_popup()
create_menu(menu, m.name)
Expand Down
6 changes: 5 additions & 1 deletion addons/material_maker/widgets/about.gd
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
tool
extends WindowDialog


func _ready():
$VBoxContainer/VBoxContainer1/ApplicationName.text = ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release")
if Engine.editor_hint:
$VBoxContainer/VBoxContainer1/ApplicationName.text = "Material Maker"
else:
$VBoxContainer/VBoxContainer1/ApplicationName.text = ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release")
pass

func open_url(url):
Expand Down
12 changes: 6 additions & 6 deletions addons/material_maker/widgets/about.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=2]

[ext_resource path="res://addons/material_maker/widgets/about.gd" type="Script" id=1]
[ext_resource path="res://icon.png" type="Texture" id=2]
[ext_resource path="res://addons/material_maker/icons/icon.png" type="Texture" id=2]
[ext_resource path="res://addons/material_maker/widgets/icon.png" type="Texture" id=3]
[ext_resource path="res://addons/material_maker/widgets/facebook.png" type="Texture" id=4]
[ext_resource path="res://addons/material_maker/widgets/twitter.png" type="Texture" id=5]
Expand Down Expand Up @@ -48,8 +48,8 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 41.0
margin_right = 110.0
margin_left = 28.0
margin_right = 123.0
margin_bottom = 82.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
Expand All @@ -66,7 +66,7 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 69.0
margin_right = 95.0
margin_bottom = 64.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
Expand All @@ -84,15 +84,15 @@ anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 68.0
margin_right = 69.0
margin_right = 95.0
margin_bottom = 82.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "APP_NAME"
text = "Material Maker"
align = 1
percent_visible = 1.0
lines_skipped = 0
Expand Down
Loading

0 comments on commit 9bdcb73

Please sign in to comment.