Skip to content

Fix non-critical errors, warnings and typos #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix non-critical errors, warnings and typos #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons/flexible_layout/flexible_overlay.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,3 @@ func _can_drop_data(at_position, data):
$Rect.visible = false
return false
return true

12 changes: 12 additions & 0 deletions addons/flexible_layout/flexible_overlay.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
[ext_resource type="Script" uid="uid://bhwlc7y7qgb2v" path="res://addons/flexible_layout/flexible_overlay.gd" id="1_5tomg"]
[ext_resource type="Texture2D" uid="uid://7ydi1c1ic17e" path="res://addons/flexible_layout/arrow.svg" id="2_0tnc1"]

<<<<<<< HEAD
[node name="Control" type="ColorRect" unique_id=619538545]
=======
[node name="Control" type="ColorRect" unique_id=1731621660]
>>>>>>> 816769bbb (Fixed non-critical errors, warnings and typos)
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
Expand All @@ -12,15 +16,23 @@ grow_vertical = 2
color = Color(0.501961, 0.501961, 0.501961, 0.501961)
script = ExtResource("1_5tomg")

<<<<<<< HEAD
[node name="Arrow" type="TextureRect" parent="." unique_id=607104480]
=======
[node name="Arrow" type="TextureRect" parent="." unique_id=589490907]
>>>>>>> 816769bbb (Fixed non-critical errors, warnings and typos)
visible = false
layout_mode = 0
offset_right = 40.0
offset_bottom = 40.0
pivot_offset = Vector2(32, 32)
texture = ExtResource("2_0tnc1")

<<<<<<< HEAD
[node name="Rect" type="ColorRect" parent="." unique_id=199752483]
=======
[node name="Rect" type="ColorRect" parent="." unique_id=1802223899]
>>>>>>> 816769bbb (Fixed non-critical errors, warnings and typos)
visible = false
layout_mode = 0
offset_right = 40.0
Expand Down
8 changes: 4 additions & 4 deletions material_maker/icons/icons.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
extends ImageTexture

func _init():
var image : Image
var img : Image
if FileAccess.file_exists("user://icons.svg"):
image = Image.load_from_file("user://icons.svg")
img = Image.load_from_file("user://icons.svg")
else:
var texture : Texture2D = ResourceLoader.load("res://material_maker/icons/icons.svg")
image = texture.get_image()
set_image(image)
img = texture.get_image()
set_image(img)
1 change: 1 addition & 0 deletions material_maker/main_window.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ func on_config_changed() -> void:
# This prevents UI elements from being too small on hiDPI displays.
ui_scale = 2 if DisplayServer.screen_get_dpi() >= 192 and DisplayServer.screen_get_size().x >= 2048 else 1
get_viewport().content_scale_factor = ui_scale
await get_tree().process_frame
size = get_viewport().size/get_viewport().content_scale_factor
position = Vector2i(0, 0)
#ProjectSettings.set_setting("display/window/stretch/scale", scale)
Expand Down
4 changes: 2 additions & 2 deletions material_maker/nodes/comment/comment.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var generator : MMGenComment:
if mm_globals.get_config("auto_size_comment"):
resize_to_selection()

var pallette_colors = [
var palette_colors = [
Color("F8B8B3"),
Color("F7FDAF"),
Color("AAF3A2"),
Expand Down Expand Up @@ -141,7 +141,7 @@ func _on_change_color_pressed():
$Popup.get_window().size = $Popup.get_window().get_contents_minimum_size() * content_scale_factor
$Popup.position = get_screen_transform() * get_local_mouse_position()
$Popup.popup()
var corrected_color = pallette_colors.duplicate(true)
var corrected_color = palette_colors.duplicate(true)
if !light_theme:
for i in corrected_color.size():
corrected_color[i] = corrected_color[i].darkened(0.5)
Expand Down
4 changes: 2 additions & 2 deletions material_maker/nodes/reroute/reroute.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ func set_generator(g : MMGenBase) -> void:
await set_preview(g.get_parameter("preview"))
update_node()

func _draw_port(slot_index: int, position: Vector2i, left: bool, color: Color) -> void:
draw_circle(position, 5, color, true, -1, true)
func _draw_port(_slot_index: int, _position: Vector2i, _left: bool, color: Color) -> void:
draw_circle(_position, 5, color, true, -1, true)

#func set_theme_type(type : StringName):
#var current_theme : Theme = mm_globals.main_window.theme
Expand Down
4 changes: 2 additions & 2 deletions material_maker/panels/preview_2d/export_menu.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ func interpret_file_name(file_name: String, path:="") -> String:
return MMLoader.interpret_file_name(file_name, path, extension, graph_node, additional_ids, resolution)


func _on_custom_resolution_x_value_changed(value: Variant) -> void:
func _on_custom_resolution_x_value_changed(_value: Variant) -> void:
update()


func _on_custom_resolution_y_value_changed(value: Variant) -> void:
func _on_custom_resolution_y_value_changed(_value: Variant) -> void:
update()
12 changes: 6 additions & 6 deletions material_maker/panels/preview_2d/preview_2d_panel.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ var checker_brightness: int = 1:
if v == checker_brightness:
return
checker_brightness = v
var color = func(v) : return Color(v,v,v,1.0)
var color_a = color.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][0])
var color_b = color.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][1])
var col = func(f) : return Color(f,f,f,1.0)
var color_a = col.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][0])
var color_b = col.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][1])
material.set_shader_parameter("background_color_1", color_a)
material.set_shader_parameter("background_color_2", color_b)
mm_globals.set_config("preview"+config_var_suffix+"_checker_brightness", checker_brightness)
Expand Down Expand Up @@ -126,11 +126,11 @@ func update_material(source):
material.set_shader_parameter("mode", view_mode)
material.set_shader_parameter("background_color", get_theme_stylebox("panel", "MM_PanelBackground").bg_color)

var color = func(v) : return Color(v,v,v,1.0)
var col = func(f) : return Color(f,f,f,1.0)
material.set_shader_parameter("background_color_1",
color.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][0]))
col.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][0]))
material.set_shader_parameter("background_color_2",
color.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][1]))
col.call(CHECKER_BRIGHTNESS_OPTIONS[checker_brightness][1]))

material.set_shader_parameter("checker_size", CHECKER_SIZE_OPTIONS[checker_size])

Expand Down
Loading