Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-11-22 16:20:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few problems for the "git replace" demo, scale up sandbox UI

Browse source
This commit is contained in:
Sebastian Morr 2020-09-22 21:56:22 +02:00
parent d69c832aba
commit ff590165d5
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
repository.gd
View file

@ -18,7 +18,6 @@ var mouse_inside = false
var _simplified_view = false var _simplified_view = false
func _ready(): func _ready():
nodes.rect_pivot_offset = nodes.rect_size / 2
file_browser.shell = shell file_browser.shell = shell
# Trigger these again because nodes were not ready before. # Trigger these again because nodes were not ready before.
@ -26,6 +25,7 @@ func _ready():
set_file_browser_active(file_browser_active) set_file_browser_active(file_browser_active)
func _process(_delta): func _process(_delta):
nodes.rect_pivot_offset = nodes.rect_size / 2
if path: if path:
apply_forces() apply_forces()
@ -48,7 +48,10 @@ func update_everything():
update_objects() update_objects()
remove_gone_stuff() remove_gone_stuff()
else: else:
index.text = "" index.text = ""
for o in objects:
objects[o].queue_free()
objects = {}
func set_path(new_path): func set_path(new_path):
@ -159,7 +162,7 @@ func find_position(n):
return n.position return n.position
func git(args, splitlines = false): func git(args, splitlines = false):
var o = shell.run("git " + args) var o = shell.run("git --no-replace-objects " + args)
if splitlines: if splitlines:
o = o.split("\n") o = o.split("\n")

3
repository.tscn
View file

@ -18,11 +18,12 @@ __meta__ = {
[node name="VSplitContainer" type="VSplitContainer" parent="."] [node name="VSplitContainer" type="VSplitContainer" parent="."]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
mouse_filter = 1
[node name="RepoVis" type="Control" parent="VSplitContainer"] [node name="RepoVis" type="Control" parent="VSplitContainer"]
margin_right = 1920.0 margin_right = 1920.0
margin_bottom = 894.0 margin_bottom = 894.0
rect_clip_content = true mouse_filter = 1
size_flags_vertical = 3 size_flags_vertical = 3
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false

2
sandbox.gd
View file

@ -2,3 +2,5 @@ extends Control
func _ready(): func _ready():
$HSplitContainer/Repository.path = "/tmp/active" $HSplitContainer/Repository.path = "/tmp/active"
get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1920, 1080), 1.5)

13
sandbox.tscn
View file

@ -8,9 +8,6 @@
[node name="Sandbox" type="Control"] [node name="Sandbox" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_right = -960.0
margin_bottom = -540.0
rect_scale = Vector2( 2, 2 )
theme = ExtResource( 3 ) theme = ExtResource( 3 )
script = ExtResource( 4 ) script = ExtResource( 4 )
__meta__ = { __meta__ = {
@ -40,16 +37,16 @@ __meta__ = {
[node name="Repository" parent="HSplitContainer" instance=ExtResource( 2 )] [node name="Repository" parent="HSplitContainer" instance=ExtResource( 2 )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_right = 469.0 margin_right = 949.0
margin_bottom = 530.0 margin_bottom = 1070.0
size_flags_horizontal = 3 size_flags_horizontal = 3
file_browser_active = false file_browser_active = false
[node name="Terminal" parent="HSplitContainer" instance=ExtResource( 1 )] [node name="Terminal" parent="HSplitContainer" instance=ExtResource( 1 )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_left = 481.0 margin_left = 961.0
margin_right = 950.0 margin_right = 1910.0
margin_bottom = 530.0 margin_bottom = 1070.0
size_flags_horizontal = 3 size_flags_horizontal = 3
repository_path = NodePath("../Repository") repository_path = NodePath("../Repository")

1
terminal.gd
View file

@ -26,6 +26,7 @@ func _ready():
command_dropdown.get_popup().connect("id_pressed", self, "load_command") command_dropdown.get_popup().connect("id_pressed", self, "load_command")
$TextEditor.connect("hide", self, "editor_closed") $TextEditor.connect("hide", self, "editor_closed")
input.grab_focus()
func _input(event): func _input(event):
if history.size() > 0: if history.size() > 0: