huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Merge pull request #22 from Calinou/improve-status-bar-display

Browse source 
Improve the status bar display
This commit is contained in:
Overloaded 2019-11-22 00:02:13 +02:00 committed by GitHub
parent 74dc59fc80 9bdc0e16b6
commit ce4b3b97aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Main.tscn
View file

@ -102,19 +102,22 @@ anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_left = -65.5 margin_left = -65.5
margin_right = 65.5 margin_right = 65.5
custom_constants/separation = 20
[node name="ZoomLevel" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"] [node name="ZoomLevel" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"]
margin_top = 7.0 margin_top = 7.0
margin_right = 80.0 margin_right = 60.0
margin_bottom = 21.0 margin_bottom = 21.0
text = "Zoom: x7.81" rect_min_size = Vector2( 60, 0 )
text = "781 %"
align = 2
[node name="CursorPosition" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"] [node name="CursorPosition" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"]
margin_left = 84.0 margin_left = 80.0
margin_top = 7.0 margin_top = 7.0
margin_right = 131.0 margin_right = 128.0
margin_bottom = 21.0 margin_bottom = 21.0
text = "[64x64]" text = "[64×64]"
align = 2 align = 2
[node name="UI" type="HBoxContainer" parent="MenuAndUI"] [node name="UI" type="HBoxContainer" parent="MenuAndUI"]

2
Scripts/CameraMovement.gd
View file

@ -34,4 +34,4 @@ func zoom_camera(dir : int) -> void:
if zoom > zoom_max: if zoom > zoom_max:
zoom = zoom_max zoom = zoom_max
if name == "Camera2D": if name == "Camera2D":
Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / zoom.x, 0.01)] Global.zoom_level_label.text = str(round(100 / Global.camera.zoom.x)) + " %"

6
Scripts/Canvas.gd
View file

@ -66,7 +66,7 @@ func camera_zoom() -> void:
Global.camera2.zoom_max = Vector2.ONE Global.camera2.zoom_max = Vector2.ONE
Global.camera.zoom = Vector2(bigger, bigger) * 0.002 Global.camera.zoom = Vector2(bigger, bigger) * 0.002
Global.camera2.zoom = Vector2(bigger, bigger) * 0.002 Global.camera2.zoom = Vector2(bigger, bigger) * 0.002
Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / Global.camera.zoom.x, 0.01)] Global.zoom_level_label.text = str(round(100 / Global.camera.zoom.x)) + " %"
#Set camera offset to the center of canvas #Set camera offset to the center of canvas
Global.camera.offset = size / 2 Global.camera.offset = size / 2
@ -95,9 +95,9 @@ func _process(delta) -> void:
if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT): if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT):
if mouse_inside_canvas: if mouse_inside_canvas:
mouse_inside_canvas = false mouse_inside_canvas = false
Global.cursor_position_label.text = "[%sx%s]" % [size.x, size.y] Global.cursor_position_label.text = "[%s×%s]" % [size.x, size.y]
else: else:
Global.cursor_position_label.text = "[%sx%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y] Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y]
#Handle Undo/Redo #Handle Undo/Redo