From 8132c8dcc5d30ba43d92f119566c9afd5bed29b3 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Mon, 25 Nov 2019 18:56:53 +0200
Subject: [PATCH] Added hint_tooltip to file brushes

- File brushes now have their file name as their hint_tooltip.
- Changed horizontal & vertical ruler minor_subdivision to 4.
---
 Scripts/Global.gd          | 3 ++-
 Scripts/HorizontalRuler.gd | 2 +-
 Scripts/Main.gd            | 2 +-
 Scripts/VerticalRuler.gd   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Scripts/Global.gd b/Scripts/Global.gd
index 59d0b64a4..e567ca0d9 100644
--- a/Scripts/Global.gd
+++ b/Scripts/Global.gd
@@ -267,7 +267,7 @@ func frame_changed(value : int) -> void:
 	canvas.frame_button.get_node("FrameButton").pressed = true
 
 
-func create_brush_button(brush_img : Image, brush_type := BRUSH_TYPES.CUSTOM) -> void:
+func create_brush_button(brush_img : Image, brush_type := BRUSH_TYPES.CUSTOM, hint_tooltip := "") -> void:
 	var brush_container
 	var brush_button = load("res://Prefabs/BrushButton.tscn").instance()
 	brush_button.brush_type = brush_type
@@ -279,6 +279,7 @@ func create_brush_button(brush_img : Image, brush_type := BRUSH_TYPES.CUSTOM) ->
 	var brush_tex := ImageTexture.new()
 	brush_tex.create_from_image(brush_img, 0)
 	brush_button.get_child(0).texture = brush_tex
+	brush_button.hint_tooltip = hint_tooltip
 	brush_container.add_child(brush_button)
 
 func remove_brush_buttons() -> void:
diff --git a/Scripts/HorizontalRuler.gd b/Scripts/HorizontalRuler.gd
index a23f822a5..4927d36ba 100644
--- a/Scripts/HorizontalRuler.gd
+++ b/Scripts/HorizontalRuler.gd
@@ -4,7 +4,7 @@ const RULER_WIDTH := 16
 
 var font := preload("res://Assets/Fonts/Roboto-Small.tres")
 var major_subdivision := 2
-var minor_subdivision := 5
+var minor_subdivision := 4
 
 var first : Vector2
 var last : Vector2
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index a73a46628..68860f294 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -132,7 +132,7 @@ func _ready() -> void:
 			if err == OK:
 				image.convert(Image.FORMAT_RGBA8)
 				Global.custom_brushes.append(image)
-				Global.create_brush_button(image, Global.BRUSH_TYPES.FILE)
+				Global.create_brush_button(image, Global.BRUSH_TYPES.FILE, file)
 		file = brushes_dir.get_next()
 	brushes_dir.list_dir_end()
 	Global.brushes_from_files = Global.custom_brushes.size()
diff --git a/Scripts/VerticalRuler.gd b/Scripts/VerticalRuler.gd
index fb49622a9..5e12182d7 100644
--- a/Scripts/VerticalRuler.gd
+++ b/Scripts/VerticalRuler.gd
@@ -4,7 +4,7 @@ const RULER_WIDTH := 16
 
 var font := preload("res://Assets/Fonts/Roboto-Small.tres")
 var major_subdivision := 2
-var minor_subdivision := 5
+var minor_subdivision := 4
 
 var first : Vector2
 var last : Vector2