online multiplayer chess game (note server currently down)
ui overhaul
98 files changed, 768 insertions, 1009 deletions
diff --git a/.github/screenshot.png b/.github/screenshot.png Binary files differindex b41231a..9ae3d0e 100644 --- a/.github/screenshot.png +++ b/.github/screenshot.png @@ -1,8 +1,8 @@ extends Node2D var refs := [] # = [[ node : object, variable : string, (code : string) ]] -var style: StyleBox = load("res://ui/theme/transblack.tres") -var font: Font = load("res://ui/ubuntu-bold.tres") +var style: StyleBox = load("res://ui/theme/transpanel.tres") +var font: Font = load("res://ui/ubuntu-bold-regular.tres") var debug := false # in debug mode or not var timer := Timer.new() var expr := Expression.new() @@ -2,5 +2,5 @@ extends Node # warning-ignore-all:unused_signal signal turn_over -signal game_over(reason, isok) # called when the game is over +signal game_over(reason) # called when the game is over signal go_back(reason, isok) # called when the game is over, and were ready to go back diff --git a/Square.tscn b/Square.tscn index 1f4812a..e245893 100644 --- a/Square.tscn +++ b/Square.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Square.gd" type="Script" id=1] -[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=2] +[ext_resource path="res://assets/blank.png" type="Texture" id=2] [sub_resource type="Shader" id=2] code = "shader_type canvas_item; @@ -87,7 +87,7 @@ func cli() -> void: parser.add_argument( Arg.new( { - triggers = ["--debug", "-d"], + triggers = ["--debug", "-D"], n_args = 1, help = "toggle debug mode", arg_names = "enabled", diff --git a/assets/ui/whitespace.png b/assets/blank.png Binary files differindex 6f51cc5..6f51cc5 100644 --- a/assets/ui/whitespace.png +++ b/assets/blank.png diff --git a/assets/ui/button.png.import b/assets/blank.png.import index be6b5df..846f3b6 100644 --- a/assets/ui/button.png.import +++ b/assets/blank.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/button.png-473760ec7449fb30c95f607492aecb17.stex" +path="res://.import/blank.png-15e8cde9e53c64a1da7cd6353c9d4ec3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/ui/button.png" -dest_files=[ "res://.import/button.png-473760ec7449fb30c95f607492aecb17.stex" ] +source_file="res://assets/blank.png" +dest_files=[ "res://.import/blank.png-15e8cde9e53c64a1da7cd6353c9d4ec3.stex" ] [params] diff --git a/assets/ui/CascadiaCode.ttf b/assets/fonts/CascadiaCode.ttf Binary files differindex 22785c2..22785c2 100644 --- a/assets/ui/CascadiaCode.ttf +++ b/assets/fonts/CascadiaCode.ttf diff --git a/assets/ui/migu.ttf b/assets/fonts/migu.ttf Binary files differindex bd468ee..bd468ee 100644 --- a/assets/ui/migu.ttf +++ b/assets/fonts/migu.ttf diff --git a/assets/ui/ubuntu/ubuntu-bold-italic.ttf b/assets/fonts/ubuntu/ubuntu-bold-italic.ttf Binary files differindex a68afb6..a68afb6 100644 --- a/assets/ui/ubuntu/ubuntu-bold-italic.ttf +++ b/assets/fonts/ubuntu/ubuntu-bold-italic.ttf diff --git a/assets/ui/ubuntu/ubuntu-bold.ttf b/assets/fonts/ubuntu/ubuntu-bold.ttf Binary files differindex 4af149a..4af149a 100644 --- a/assets/ui/ubuntu/ubuntu-bold.ttf +++ b/assets/fonts/ubuntu/ubuntu-bold.ttf diff --git a/assets/ui/ubuntu/ubuntu-italic.ttf b/assets/fonts/ubuntu/ubuntu-italic.ttf Binary files differindex b022726..b022726 100644 --- a/assets/ui/ubuntu/ubuntu-italic.ttf +++ b/assets/fonts/ubuntu/ubuntu-italic.ttf diff --git a/assets/ui/ubuntu/ubuntu-normal-nerd.ttf b/assets/fonts/ubuntu/ubuntu-normal-nerd.ttf Binary files differindex 1ec9ede..1ec9ede 100644 --- a/assets/ui/ubuntu/ubuntu-normal-nerd.ttf +++ b/assets/fonts/ubuntu/ubuntu-normal-nerd.ttf diff --git a/assets/ui/button.png b/assets/ui/button.png Binary files differdeleted file mode 100644 index 96e893b..0000000 --- a/assets/ui/button.png +++ /dev/null diff --git a/assets/ui/buttonhover.png b/assets/ui/buttonhover.png Binary files differdeleted file mode 100644 index 4839d27..0000000 --- a/assets/ui/buttonhover.png +++ /dev/null diff --git a/assets/ui/buttonhover.png.import b/assets/ui/buttonhover.png.import deleted file mode 100644 index d7e54d5..0000000 --- a/assets/ui/buttonhover.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/buttonhover.png-9a545c33dc4f7b4ec6792b85d9715200.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/ui/buttonhover.png" -dest_files=[ "res://.import/buttonhover.png-9a545c33dc4f7b4ec6792b85d9715200.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/ui/checkedbox.png b/assets/ui/checkedbox.png Binary files differdeleted file mode 100644 index fab3380..0000000 --- a/assets/ui/checkedbox.png +++ /dev/null diff --git a/assets/ui/checkedbox.png.import b/assets/ui/checkedbox.png.import deleted file mode 100644 index 87c007a..0000000 --- a/assets/ui/checkedbox.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/checkedbox.png-f26561169cef71f8f74eac78fd309778.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/ui/checkedbox.png" -dest_files=[ "res://.import/checkedbox.png-f26561169cef71f8f74eac78fd309778.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/ui/svg/.gdignore b/assets/ui/svg/.gdignore deleted file mode 100644 index e69de29..0000000 --- a/assets/ui/svg/.gdignore +++ /dev/null diff --git a/assets/ui/svg/button.svg b/assets/ui/svg/button.svg deleted file mode 100644 index ac83e66..0000000 --- a/assets/ui/svg/button.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg4" width="6" height="6" version="1.1" viewBox="0 0 1.587 1.587"><path style="fill:#000;stroke:#fff;stroke-width:.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="path2" d="M.265.53.529.264h.53l.264.264v.53l-.265.264H.53l-.264-.265Z"/></svg>
\ No newline at end of file diff --git a/assets/ui/svg/checkedbox.svg b/assets/ui/svg/checkedbox.svg deleted file mode 100644 index b7571df..0000000 --- a/assets/ui/svg/checkedbox.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg4" width="6" height="6" version="1.1" viewBox="0 0 1.587 1.587"><path style="fill:#4a0;stroke:#fff;stroke-width:.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="path2" d="M.265.53.529.264h.53l.264.264v.53l-.265.264H.53l-.264-.265Z"/></svg>
\ No newline at end of file diff --git a/assets/ui/whitespace.png.import b/assets/ui/whitespace.png.import deleted file mode 100644 index d584d4d..0000000 --- a/assets/ui/whitespace.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/whitespace.png-0d75ae68186fe235c73fb33414a04eec.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/ui/whitespace.png" -dest_files=[ "res://.import/whitespace.png-0d75ae68186fe235c73fb33414a04eec.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/project.godot b/project.godot index f79d9a0..8d19068 100644 --- a/project.godot +++ b/project.godot @@ -14,7 +14,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/gdcli/Arg.gd" }, { -"base": "Button", +"base": "CenterContainer", "class": "BackButton", "language": "GDScript", "path": "res://ui/board/BackButton.gd" @@ -95,6 +95,11 @@ _global_script_classes=[ { "path": "res://ui/menus/sidebarright/flipbutton.gd" }, { "base": "Control", +"class": "GameUI", +"language": "GDScript", +"path": "res://ui/board/Game.gd" +}, { +"base": "Control", "class": "Grid", "language": "GDScript", "path": "res://ui/board/Board.gd" @@ -114,11 +119,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://ui/colorpicker/HueSlider.gd" }, { -"base": "Label", -"class": "InfoLabel", -"language": "GDScript", -"path": "res://ui/menus/account/InfoLabel.gd" -}, { "base": "Control", "class": "Lobby", "language": "GDScript", @@ -214,7 +214,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://ui/menus/sidebarright/undobutton.gd" }, { -"base": "PanelContainer", +"base": "MarginContainer", "class": "UserPanel", "language": "GDScript", "path": "res://ui/menus/sidebarright/UserPanel.gd" @@ -247,11 +247,11 @@ _global_script_class_icons={ "ExpandableTextEdit": "", "FEN": "", "FlipButton": "", +"GameUI": "", "Grid": "", "GridMenu": "", "GridMenuButton": "", "HueSlider": "", -"InfoLabel": "", "Lobby": "", "MaterialLabel": "", "MaterialLabelManager": "", @@ -323,7 +323,7 @@ enabled=PoolStringArray( ) [gui] theme/custom="res://ui/theme/main.theme" -theme/custom_font="res://ui/ubuntu-bold.tres" +theme/custom_font="res://ui/ubuntu-bold-medium.tres" [importer_defaults] diff --git a/ui/Cascadia-Code-regular.tres b/ui/Cascadia-Code-regular.tres new file mode 100644 index 0000000..99b81ee --- /dev/null +++ b/ui/Cascadia-Code-regular.tres @@ -0,0 +1,11 @@ +[gd_resource type="DynamicFont" load_steps=4 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/CascadiaCode.ttf" type="DynamicFontData" id=3] + +[resource] +size = 20 +font_data = ExtResource( 3 ) +fallback/0 = ExtResource( 1 ) +fallback/1 = ExtResource( 2 ) diff --git a/ui/Status.gd b/ui/Status.gd index 99c6697..1cf2eb7 100644 --- a/ui/Status.gd +++ b/ui/Status.gd @@ -3,7 +3,12 @@ class_name StatusLabel func set_text(newtext: String, time := 7) -> void: - text = newtext + __set_text(newtext) if time != 0: yield(get_tree().create_timer(time), "timeout") - text = "" + __set_text("") + + +func __set_text(_text: String = ""): + text = _text + visible = text != "" diff --git a/ui/background/ColorfullBackground.gd b/ui/background/ColorfullBackground.gd index 0bdba39..de5ada5 100644 --- a/ui/background/ColorfullBackground.gd +++ b/ui/background/ColorfullBackground.gd @@ -3,6 +3,8 @@ extends ColorRect export(PoolColorArray) var colors export(float) var length := 2.8 +onready var fallback_color = color + var rainbow := true setget set_rainbow var tween := Tween.new() var timer := Timer.new() @@ -33,5 +35,5 @@ func change_color() -> void: clr = Color(rand(clr.r), rand(clr.g), rand(clr.b), 1) tween.interpolate_property(self, "color", color, clr, length, Tween.TRANS_ELASTIC) else: - tween.interpolate_property(self, "color", color, colors[-1], length, Tween.TRANS_ELASTIC) + tween.interpolate_property(self, "color", color, fallback_color, length, Tween.TRANS_ELASTIC) tween.start() diff --git a/ui/background/ColorfullBackground.tscn b/ui/background/ColorfullBackground.tscn index dd9f95c..3e29d7f 100644 --- a/ui/background/ColorfullBackground.tscn +++ b/ui/background/ColorfullBackground.tscn @@ -6,5 +6,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 +color = Color( 0, 0.144, 0.18, 1 ) script = ExtResource( 1 ) -colors = PoolColorArray( 0.784314, 0.427451, 0.427451, 1, 0.913725, 0.847059, 0.403922, 1, 0.380392, 0.741176, 0.647059, 1, 0.321569, 0.368627, 0.858824, 1, 0.596078, 0.188235, 0.619608, 1, 0.109804, 0.160784, 0.564706, 1, 0.376471, 0.796078, 0.317647, 1, 0.8, 0.364706, 0.588235, 1, 0.984314, 0.858824, 0.282353, 1, 0.164706, 0.0862745, 0.247059, 1, 0.603922, 0.596078, 0.701961, 1, 0.592157, 0.592157, 0.592157, 1 ) +colors = PoolColorArray( 0.7, 0.525, 0, 1, 0.164706, 0.631373, 0.596078, 1, 0.126, 0.460833, 0.7, 1, 0.385, 0.40075, 0.7, 1, 0.521569, 0.6, 0, 1, 0.83, 0.249, 0.529817, 1, 0.603922, 0.596078, 0.701961, 1 ) diff --git a/ui/barbutton/BarButton.theme b/ui/barbutton/BarButton.theme Binary files differindex 67d5fde..5f9e838 100644 --- a/ui/barbutton/BarButton.theme +++ b/ui/barbutton/BarButton.theme diff --git a/ui/barbutton/BarTextureButton.gd b/ui/barbutton/BarTextureButton.gd index 579d4b1..548ac0c 100644 --- a/ui/barbutton/BarTextureButton.gd +++ b/ui/barbutton/BarTextureButton.gd @@ -3,10 +3,10 @@ class_name BarTextureButton var focused: bool setget _focused -export(Color) var normal_color := Color.black -export(Color) var highlight_color := Color(0.670588, 0.352941, 0.352941) -export(Color) var pressed_color := Color(0.356863, 0.572549, 0.647059) -export(Color) var disabled_color := Color(0.501961, 0.501961, 0.501961) +export(Color) var normal_color: Color +export(Color) var highlight_color: Color +export(Color) var pressed_color: Color +export(Color) var disabled_color: Color onready var background := $Background @@ -25,7 +25,7 @@ func set_disabled(new: bool) -> void: func _process(_delta): - if visible and Engine.get_idle_frames() % n == 0: + if visible: _update() diff --git a/ui/barbutton/BarTextureButton.tscn b/ui/barbutton/BarTextureButton.tscn index 0290105..b90cbdf 100644 --- a/ui/barbutton/BarTextureButton.tscn +++ b/ui/barbutton/BarTextureButton.tscn @@ -9,15 +9,17 @@ rect_min_size = Vector2( 50, 50 ) mouse_default_cursor_shape = 2 expand = true script = ExtResource( 2 ) -normal_color = Color( 0.188235, 0.180392, 0.172549, 1 ) -disabled_color = Color( 0.188235, 0.180392, 0.172549, 1 ) +normal_color = Color( 0.027451, 0.211765, 0.258824, 1 ) +highlight_color = Color( 0.345098, 0.431373, 0.458824, 1 ) +pressed_color = Color( 0.14902, 0.545098, 0.823529, 1 ) +disabled_color = Color( 0, 0.168627, 0.211765, 1 ) [node name="Background" type="ColorRect" parent="."] show_behind_parent = true anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -color = Color( 0.188235, 0.180392, 0.172549, 1 ) +color = Color( 0.027451, 0.211765, 0.258824, 1 ) [connection signal="mouse_entered" from="." to="." method="_focused" binds= [ true ]] [connection signal="mouse_exited" from="." to="." method="_focused" binds= [ false ]] diff --git a/ui/barbutton/big-ubuntu-bold.tres b/ui/barbutton/big-ubuntu-bold.tres index d0d34e9..e11bf48 100644 --- a/ui/barbutton/big-ubuntu-bold.tres +++ b/ui/barbutton/big-ubuntu-bold.tres @@ -1,8 +1,8 @@ [gd_resource type="DynamicFont" load_steps=4 format=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=3] [resource] size = 85 diff --git a/ui/barbutton/default.tres b/ui/barbutton/default.tres index 1651cef..fb0ce84 100644 --- a/ui/barbutton/default.tres +++ b/ui/barbutton/default.tres @@ -1,4 +1,4 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -bg_color = Color( 0.188235, 0.180392, 0.172549, 1 ) +bg_color = Color( 0.027451, 0.211765, 0.258824, 1 ) diff --git a/ui/barbutton/default_highlight.tres b/ui/barbutton/default_highlight.tres index a71a53e..a57b2a5 100644 --- a/ui/barbutton/default_highlight.tres +++ b/ui/barbutton/default_highlight.tres @@ -1,4 +1,4 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -bg_color = Color( 0.670588, 0.352941, 0.352941, 1 ) +bg_color = Color( 0.345098, 0.431373, 0.458824, 1 ) diff --git a/ui/barbutton/default_pressed.tres b/ui/barbutton/default_pressed.tres index a5133aa..d0cc4bf 100644 --- a/ui/barbutton/default_pressed.tres +++ b/ui/barbutton/default_pressed.tres @@ -1,4 +1,4 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -bg_color = Color( 0.356863, 0.572549, 0.647059, 1 ) +bg_color = Color( 0.14902, 0.545098, 0.823529, 1 ) diff --git a/ui/board/BackButton.gd b/ui/board/BackButton.gd index 9d0d362..4939232 100644 --- a/ui/board/BackButton.gd +++ b/ui/board/BackButton.gd @@ -1,14 +1,15 @@ -extends Button +extends CenterContainer class_name BackButton - -func _ready(): - Events.connect("game_over", self, "game_over") +var button := Button.new() -func _pressed(): - Events.emit_signal("go_back", "", true) +func _ready(): + add_child(button) + Events.connect("game_over", self, "_game_over") + button.text = "go back" + button.connect("pressed", Events, "emit_signal", ["go_back", "", true]) -func game_over(_reason: String, _ok: bool) -> void: +func _game_over(_why: String) -> void: show() diff --git a/ui/board/Board.gd b/ui/board/Board.gd index 7a7046a..175a5b2 100644 --- a/ui/board/Board.gd +++ b/ui/board/Board.gd @@ -39,11 +39,9 @@ var last_clicked var check_circle: GradientTexture2D = load("res://piece/check-circle.tres") var take_circle: GradientTexture2D = load("res://piece/takeable-circle.tres") -export(NodePath) var sidebar_path = @"" -onready var sidebar := get_node_or_null(sidebar_path) -export(NodePath) var ui_path = @"" +onready var sidebar := get_node_or_null("%Sidebar") +onready var game: GameUI = owner if owner is GameUI else null onready var darken = $Darken -onready var ui := get_node_or_null(ui_path) onready var foreground := $Foreground onready var background := $Background onready var pieces := $Pieces @@ -64,13 +62,14 @@ func _resized(): piece_size = rect_size / 8 piece_size.x = clamp(piece_size.x, 0, piece_size.y) piece_size.y = clamp(piece_size.y, 0, piece_size.x) - rect_pivot_offset = (piece_size * 8) / 2 - foreground.rect_pivot_offset = rect_pivot_offset check_circle.width = piece_size.x check_circle.height = piece_size.y take_circle.width = piece_size.x take_circle.height = piece_size.y - if !(board.empty() && background_array.empty()) and piece_size != old_pc: + if foreground: + rect_pivot_offset = (piece_size * 8) / 2 + foreground.rect_pivot_offset = rect_pivot_offset + if not (board.empty() && background_array.empty()) && piece_size != old_pc: resize_board() Log.debug("Resizing board") @@ -112,7 +111,7 @@ func create_squares() -> void: # create the board func create_labels() -> void: - var font: DynamicFont = load("res://ui/ubuntu-bold.tres").duplicate() + var font: DynamicFont = load("res://ui/ubuntu-bold-regular.tres").duplicate() font.size = 15 for k in Chess.SQUARE_MAP: if k == "h1": @@ -144,9 +143,10 @@ func init_label(font: DynamicFont, alg: String, text: String, valign := 0, align var label := Label.new() label.align = align label.valign = valign - label.name = text label.size_flags_horizontal = SIZE_EXPAND_FILL label.size_flags_vertical = SIZE_EXPAND_FILL + label.mouse_filter = MOUSE_FILTER_IGNORE + label.name = text label.text = text label.add_color_override( "font_color", Globals.board_color1 if Chess.square_color(alg) == "dark" else Globals.board_color2 @@ -160,12 +160,15 @@ func init_label(font: DynamicFont, alg: String, text: String, valign := 0, align func create_margin_container(margin := 5) -> MarginContainer: - var container := MarginContainer.new() - container.add_constant_override("margin_top", margin) - container.add_constant_override("margin_left", margin) - container.add_constant_override("margin_right", margin) - container.add_constant_override("margin_bottom", margin) - return container + var c := MarginContainer.new() + c.add_constant_override("margin_top", margin) + c.add_constant_override("margin_left", margin) + c.add_constant_override("margin_right", margin) + c.add_constant_override("margin_bottom", margin) + c.size_flags_horizontal = SIZE_EXPAND_FILL + c.size_flags_vertical = SIZE_EXPAND_FILL + c.mouse_filter = MOUSE_FILTER_IGNORE + return c func clear_pieces() -> void: @@ -301,15 +304,15 @@ func clear_last_clicked(): func draw(reason := "") -> void: var string = "draw by " + reason - ui.set_status(string, 0) + game.set_status(string, 0) SoundFx.play("Victory") - Events.emit_signal("game_over", string, true) + Events.emit_signal("game_over", string) func win(winner: String, reason := "") -> void: var string = "%s won the game by %s" % [Utils.expand_color(winner), reason] - ui.set_status(string, 0) #: black won the game by checkmate - Events.emit_signal("game_over", string, true) + game.set_status(string, 0) #: black won the game by checkmate + Events.emit_signal("game_over", string) SoundFx.play("Victory") diff --git a/ui/board/Board.tscn b/ui/board/Board.tscn index 1f7de1e..41abe0d 100644 --- a/ui/board/Board.tscn +++ b/ui/board/Board.tscn @@ -56,8 +56,6 @@ green_overlay = Color( 0.1272, 0.53, 0.18762, 1 ) margin_right = 600.0 margin_bottom = 600.0 mouse_filter = 2 -custom_constants/vseparation = 0 -custom_constants/hseparation = 0 columns = 8 [node name="Darken" type="ColorRect" parent="."] diff --git a/ui/board/Game.gd b/ui/board/Game.gd index 7f28653..c614e75 100644 --- a/ui/board/Game.gd +++ b/ui/board/Game.gd @@ -1,8 +1,9 @@ extends Control +class_name GameUI onready var status: StatusLabel = find_node("Status") onready var chat: Chat = find_node("Chat") -onready var sidebar := $Holder/SidebarRight +onready var sidebar := $"%Sidebar" onready var panels := [ sidebar.whitepanel, sidebar.blackpanel, diff --git a/ui/board/Game.tscn b/ui/board/Game.tscn index e27edc1..29dd5d6 100644 --- a/ui/board/Game.tscn +++ b/ui/board/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/menus/sidebarright/SidebarRight.tscn" type="PackedScene" id=2] @@ -7,6 +7,18 @@ [ext_resource path="res://ui/board/Board.tscn" type="PackedScene" id=5] [ext_resource path="res://ui/board/BackButton.gd" type="Script" id=6] +[sub_resource type="StyleBoxFlat" id=1] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 0.392157 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color( 0.0286, 0.21372, 0.26, 0.588235 ) + [node name="Game" type="MarginContainer"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -23,12 +35,13 @@ custom_constants/separation = 0 [node name="Chat" parent="Holder" instance=ExtResource( 3 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 391.0 +margin_right = 382.0 margin_bottom = 800.0 +rect_min_size = Vector2( 350, 0 ) [node name="middle" type="VBoxContainer" parent="Holder"] -margin_left = 391.0 -margin_right = 1031.0 +margin_left = 382.0 +margin_right = 1082.0 margin_bottom = 800.0 rect_min_size = Vector2( 640, 640 ) mouse_filter = 2 @@ -39,26 +52,37 @@ custom_constants/separation = 0 [node name="Board" parent="Holder/middle" instance=ExtResource( 5 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 640.0 +margin_right = 700.0 margin_bottom = 800.0 -sidebar_path = NodePath("../../SidebarRight") -ui_path = NodePath("../../..") +rect_min_size = Vector2( 700, 700 ) -[node name="BackButton" type="Button" parent="Holder/middle"] +[node name="BackButton" type="CenterContainer" parent="Holder/middle"] visible = false -margin_left = 245.0 -margin_top = 698.0 -margin_right = 465.0 +margin_top = 720.0 +margin_right = 700.0 margin_bottom = 800.0 -rect_min_size = Vector2( 220, 0 ) -size_flags_horizontal = 4 -size_flags_vertical = 4 -text = "go back" +rect_min_size = Vector2( 0, 80 ) script = ExtResource( 6 ) -[node name="SidebarRight" parent="Holder" instance=ExtResource( 2 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 1031.0 +[node name="right" type="PanelContainer" parent="Holder"] +margin_left = 1082.0 margin_right = 1422.0 margin_bottom = 800.0 +mouse_filter = 2 +custom_styles/panel = SubResource( 1 ) + +[node name="V" type="VBoxContainer" parent="Holder/right"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 330.0 +margin_bottom = 790.0 +mouse_filter = 2 +alignment = 1 + +[node name="Sidebar" parent="Holder/right/V" instance=ExtResource( 2 )] +unique_name_in_owner = true +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 216.0 +margin_right = 320.0 +margin_bottom = 564.0 diff --git a/ui/chat/Chat.tscn b/ui/chat/Chat.tscn index 1488cda..129abaf 100644 --- a/ui/chat/Chat.tscn +++ b/ui/chat/Chat.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://ui/chat/chat_theme.tres" type="Theme" id=1] +[ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/chat/Chat.gd" type="Script" id=2] [ext_resource path="res://ui/chat/MessageList.tscn" type="PackedScene" id=3] [ext_resource path="res://ui/chat/TextEditor.tscn" type="PackedScene" id=5] @@ -23,11 +23,11 @@ custom_constants/separation = 0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 1422.0 -margin_bottom = 780.0 +margin_bottom = 757.0 mouse_filter = 2 [node name="Input" parent="v" instance=ExtResource( 5 )] -margin_top = 780.0 +margin_top = 757.0 margin_right = 1422.0 margin_bottom = 800.0 diff --git a/ui/chat/MessageList.tscn b/ui/chat/MessageList.tscn index 630d18f..ea252f0 100644 --- a/ui/chat/MessageList.tscn +++ b/ui/chat/MessageList.tscn @@ -3,7 +3,15 @@ [ext_resource path="res://ui/chat/MessageList.gd" type="Script" id=1] [sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.14902, 0.141176, 0.129412, 0.784314 ) +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 0.392157 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_color = Color( 0.0286, 0.21372, 0.26, 0.588235 ) [node name="MessageList" type="PanelContainer"] anchor_right = 1.0 @@ -13,19 +21,21 @@ custom_styles/panel = SubResource( 1 ) script = ExtResource( 1 ) [node name="MC" type="MarginContainer" parent="."] -margin_right = 1422.0 -margin_bottom = 800.0 +margin_left = 10.0 +margin_top = 10.0 +margin_right = 1412.0 +margin_bottom = 790.0 custom_constants/margin_right = 10 custom_constants/margin_left = 10 [node name="scroller" type="ScrollContainer" parent="MC"] margin_left = 10.0 -margin_right = 1412.0 -margin_bottom = 800.0 +margin_right = 1392.0 +margin_bottom = 780.0 scroll_horizontal_enabled = false [node name="labels" type="VBoxContainer" parent="MC/scroller"] -margin_right = 1402.0 +margin_right = 1382.0 size_flags_horizontal = 3 size_flags_vertical = 2 custom_constants/separation = 0 diff --git a/ui/chat/TextEditor.gd b/ui/chat/TextEditor.gd index a3e75eb..22bdeaa 100644 --- a/ui/chat/TextEditor.gd +++ b/ui/chat/TextEditor.gd @@ -17,12 +17,14 @@ signal done(text) onready var textedit: TextEdit = $"%text" onready var placeholder := $"%placeholder" -onready var sendbutton := $"%SendButton" + + +func _ready(): + $"%SendButton".visible = OS.has_touchscreen_ui_hint() func _text_changed() -> void: placeholder.visible = len(textedit.text) == 0 - sendbutton.visible = len(textedit.text) != 0 func send(msg := textedit.text) -> void: diff --git a/ui/chat/TextEditor.tscn b/ui/chat/TextEditor.tscn index b611ddd..60a0f72 100644 --- a/ui/chat/TextEditor.tscn +++ b/ui/chat/TextEditor.tscn @@ -2,15 +2,24 @@ [ext_resource path="res://ui/chat/textedit.gd" type="Script" id=1] [ext_resource path="res://ui/barbutton/BarButton.theme" type="Theme" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=4] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=5] -[ext_resource path="res://ui/chat/chat_theme.tres" type="Theme" id=6] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=5] +[ext_resource path="res://ui/theme/main.theme" type="Theme" id=6] [ext_resource path="res://ui/chat/TextEditor.gd" type="Script" id=7] -[ext_resource path="res://ui/theme/richtextlabel/tiny.tres" type="DynamicFont" id=8] +[ext_resource path="res://ui/ubuntu-regular.tres" type="DynamicFont" id=8] -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.1, 0.0948, 0.087, 0.784314 ) +[sub_resource type="StyleBoxFlat" id=4] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 1 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color( 0.027451, 0.211765, 0.258824, 1 ) [sub_resource type="DynamicFont" id=3] size = 40 @@ -22,38 +31,29 @@ fallback/1 = ExtResource( 4 ) margin_right = 965.0 margin_bottom = 50.0 theme = ExtResource( 6 ) -custom_styles/panel = SubResource( 2 ) +custom_styles/panel = SubResource( 4 ) script = ExtResource( 7 ) [node name="H" type="HBoxContainer" parent="."] -margin_right = 965.0 -margin_bottom = 50.0 +margin_left = 10.0 +margin_top = 10.0 +margin_right = 955.0 +margin_bottom = 40.0 [node name="TextEditHolder" type="MarginContainer" parent="H"] -margin_right = 965.0 -margin_bottom = 50.0 +margin_right = 945.0 +margin_bottom = 30.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/margin_right = 5 custom_constants/margin_left = 5 -[node name="placeholder" type="Label" parent="H/TextEditHolder"] -unique_name_in_owner = true -margin_left = 5.0 -margin_top = 24.0 -margin_right = 20.0 -margin_bottom = 26.0 -size_flags_horizontal = 0 -custom_colors/font_color = Color( 1, 1, 1, 0.509804 ) -text = "write text here" -valign = 2 - [node name="text" type="TextEdit" parent="H/TextEditHolder"] unique_name_in_owner = true margin_left = 5.0 -margin_top = 15.0 -margin_right = 960.0 -margin_bottom = 35.0 +margin_top = 5.0 +margin_right = 940.0 +margin_bottom = 25.0 rect_min_size = Vector2( 200, 20 ) size_flags_vertical = 4 custom_fonts/font = ExtResource( 8 ) @@ -65,6 +65,18 @@ caret_blink_speed = 0.45 script = ExtResource( 1 ) max_lines = 4 +[node name="placeholder" type="Label" parent="H/TextEditHolder"] +unique_name_in_owner = true +margin_left = 5.0 +margin_top = 3.0 +margin_right = 141.0 +margin_bottom = 26.0 +size_flags_horizontal = 0 +custom_colors/font_color = Color( 0.929412, 0.905882, 0.827451, 0.576471 ) +custom_fonts/font = ExtResource( 8 ) +text = "write text here" +valign = 2 + [node name="SendButton" type="Button" parent="H"] unique_name_in_owner = true visible = false diff --git a/ui/chat/chat_theme.tres b/ui/chat/chat_theme.tres deleted file mode 100644 index 5a26d6c..0000000 --- a/ui/chat/chat_theme.tres +++ /dev/null @@ -1,78 +0,0 @@ -[gd_resource type="Theme" load_steps=19 format=2] - -[ext_resource path="res://ui/theme/richtextlabel/tiny-bold.tres" type="DynamicFont" id=1] -[ext_resource path="res://assets/ui/CascadiaCode.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=4] -[ext_resource path="res://ui/theme/richtextlabel/tiny-italic.tres" type="DynamicFont" id=7] -[ext_resource path="res://ui/theme/button.tres" type="StyleBox" id=8] -[ext_resource path="res://ui/theme/flatblack.tres" type="StyleBox" id=11] -[ext_resource path="res://ui/theme/richtextlabel/tiny.tres" type="DynamicFont" id=12] -[ext_resource path="res://ui/theme/richtextlabel/tiny-bold-italic.tres" type="DynamicFont" id=15] -[ext_resource path="res://ui/theme/richtextlabel/tiny-Cascadia-Code.tres" type="DynamicFont" id=16] - -[sub_resource type="StyleBoxEmpty" id=7] - -[sub_resource type="StyleBoxEmpty" id=8] - -[sub_resource type="StyleBoxEmpty" id=9] - -[sub_resource type="StyleBoxEmpty" id=4] - -[sub_resource type="StyleBoxEmpty" id=21] - -[sub_resource type="StyleBoxEmpty" id=5] - -[sub_resource type="StyleBoxFlat" id=24] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.588235 ) -border_width_top = 65 -border_color = Color( 0.180392, 0.180392, 0.180392, 1 ) -corner_radius_top_left = 30 -corner_radius_top_right = 30 -corner_radius_bottom_right = 30 -corner_radius_bottom_left = 30 -corner_detail = 15 -expand_margin_top = 65.0 - -[sub_resource type="DynamicFontData" id=26] -font_path = "res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" - -[sub_resource type="DynamicFont" id=27] -size = 20 -font_data = SubResource( 26 ) -fallback/0 = ExtResource( 2 ) - -[resource] -default_font = SubResource( 27 ) -HBoxContainer/constants/separation = 15 -HSlider/styles/grabber_area = SubResource( 7 ) -HSlider/styles/grabber_area_highlight = SubResource( 8 ) -HSlider/styles/slider = SubResource( 9 ) -ItemList/colors/font_color = Color( 1, 1, 1, 1 ) -ItemList/colors/font_color_selected = Color( 0.905882, 0.905882, 0.905882, 1 ) -ItemList/styles/bg = SubResource( 4 ) -ItemList/styles/bg_focus = ExtResource( 11 ) -LineEdit/colors/cursor_color = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color_uneditable = Color( 1, 1, 1, 0.67451 ) -LineEdit/styles/focus = ExtResource( 8 ) -LineEdit/styles/normal = ExtResource( 8 ) -LineEdit/styles/read_only = ExtResource( 8 ) -RichTextLabel/colors/default_color = Color( 1, 1, 1, 1 ) -RichTextLabel/fonts/bold_font = ExtResource( 1 ) -RichTextLabel/fonts/bold_italics_font = ExtResource( 15 ) -RichTextLabel/fonts/italics_font = ExtResource( 7 ) -RichTextLabel/fonts/mono_font = ExtResource( 16 ) -RichTextLabel/fonts/normal_font = ExtResource( 12 ) -TextEdit/styles/normal = SubResource( 21 ) -VBoxContainer/constants/separation = 15 -VScrollBar/styles/scroll = SubResource( 5 ) -WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) -WindowDialog/constants/close_h_ofs = 0 -WindowDialog/constants/close_v_ofs = 0 -WindowDialog/constants/title_height = 60 -WindowDialog/icons/close = ExtResource( 4 ) -WindowDialog/icons/close_highlight = ExtResource( 4 ) -WindowDialog/styles/panel = SubResource( 24 ) diff --git a/ui/colorpicker/ColorPicker.tscn b/ui/colorpicker/ColorPicker.tscn index d39ed16..252192d 100644 --- a/ui/colorpicker/ColorPicker.tscn +++ b/ui/colorpicker/ColorPicker.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=11 format=2] [ext_resource path="res://ui/colorpicker/ColorPicker.gd" type="Script" id=1] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] [ext_resource path="res://ui/barbutton/BarButton.theme" type="Theme" id=3] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=4] [ext_resource path="res://ui/colorpicker/HueSlider.gd" type="Script" id=6] [ext_resource path="res://ui/colorpicker/ColorSelect.gd" type="Script" id=7] [ext_resource path="res://ui/colorpicker/OldColorView.gd" type="Script" id=9] diff --git a/ui/colorpicker/ColorPickerButton.tscn b/ui/colorpicker/ColorPickerButton.tscn index a2e63b6..35f0887 100644 --- a/ui/colorpicker/ColorPickerButton.tscn +++ b/ui/colorpicker/ColorPickerButton.tscn @@ -3,17 +3,7 @@ [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/colorpicker/ColorPickerButton.gd" type="Script" id=2] [ext_resource path="res://ui/colorpicker/ColorPicker.tscn" type="PackedScene" id=3] - -[sub_resource type="StyleBoxFlat" id=1] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_top = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.784314 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +[ext_resource path="res://ui/theme/panel.tres" type="StyleBox" id=4] [node name="ColorPickerButton" type="Button"] margin_right = 232.0 @@ -29,7 +19,7 @@ margin_top = 50.0 margin_right = 195.0 margin_bottom = 195.0 rect_min_size = Vector2( 125, 125 ) -custom_styles/panel = SubResource( 1 ) +custom_styles/panel = ExtResource( 4 ) [node name="ColorPicker" parent="Popup" instance=ExtResource( 3 )] anchor_right = 1.0 diff --git a/ui/confirm/Confirm.tscn b/ui/confirm/Confirm.tscn index 16df721..3812a53 100644 --- a/ui/confirm/Confirm.tscn +++ b/ui/confirm/Confirm.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/barbutton/BarButton.theme" type="Theme" id=2] [ext_resource path="res://ui/confirm/confirm.gd" type="Script" id=4] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=6] +[ext_resource path="res://ui/ubuntu-bold-regular.tres" type="DynamicFont" id=6] [node name="Confirm" type="WindowDialog"] margin_right = 400.0 diff --git a/ui/gridmenu/GridMenuButton.tscn b/ui/gridmenu/GridMenuButton.tscn index 07f5f9d..0869952 100644 --- a/ui/gridmenu/GridMenuButton.tscn +++ b/ui/gridmenu/GridMenuButton.tscn @@ -1,216 +1,16 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://ui/gridmenu/GridMenu.gd" type="Script" id=1] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=2] [ext_resource path="res://ui/gridmenu/GridMenuButton.gd" type="Script" id=3] -[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=4] -[ext_resource path="res://assets/ui/CascadiaCode.ttf" type="DynamicFontData" id=5] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold-italic.ttf" type="DynamicFontData" id=6] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=7] -[ext_resource path="res://assets/ui/checkedbox.png" type="Texture" id=8] -[ext_resource path="res://ui/theme/transblack.tres" type="StyleBox" id=9] -[ext_resource path="res://ui/theme/button.tres" type="StyleBox" id=10] -[ext_resource path="res://ui/theme/flatblack.tres" type="StyleBox" id=11] -[ext_resource path="res://assets/ui/button.png" type="Texture" id=12] -[ext_resource path="res://ui/ubuntu-bold.tres" type="DynamicFont" id=13] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=14] -[ext_resource path="res://ui/theme/buttonhover.tres" type="StyleBox" id=15] -[ext_resource path="res://ui/theme/panel.tres" type="StyleBox" id=16] +[ext_resource path="res://ui/ubuntu-bold-medium.tres" type="DynamicFont" id=13] [sub_resource type="StyleBoxEmpty" id=24] -[sub_resource type="StyleBoxTexture" id=6] -texture = ExtResource( 12 ) -region_rect = Rect2( 0, 0, 84, 84 ) -margin_left = 28.0 -margin_right = 28.0 -margin_top = 28.0 -margin_bottom = 28.0 -modulate_color = Color( 0.772549, 0.772549, 0.772549, 0.54902 ) - -[sub_resource type="StyleBoxEmpty" id=7] - -[sub_resource type="StyleBoxEmpty" id=8] - -[sub_resource type="StyleBoxEmpty" id=9] - -[sub_resource type="StyleBoxEmpty" id=4] - -[sub_resource type="StyleBoxFlat" id=22] -content_margin_left = 5.0 -content_margin_right = 5.0 -content_margin_top = 5.0 -content_margin_bottom = 5.0 -bg_color = Color( 0.188235, 0.180392, 0.172549, 1 ) - -[sub_resource type="StyleBoxFlat" id=3] -bg_color = Color( 0.0784314, 0.0784314, 0.0784314, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 1, 1, 1, 1 ) -corner_detail = 20 -expand_margin_left = 10.0 -expand_margin_right = 10.0 - -[sub_resource type="DynamicFont" id=19] -size = 20 -font_data = ExtResource( 6 ) - -[sub_resource type="DynamicFont" id=14] -size = 20 -font_data = ExtResource( 5 ) - -[sub_resource type="DynamicFont" id=20] -size = 20 -font_data = ExtResource( 7 ) - -[sub_resource type="StyleBoxFlat" id=10] -content_margin_left = 30.0 -content_margin_right = 30.0 -content_margin_top = 30.0 -content_margin_bottom = 30.0 -bg_color = Color( 0, 0, 0, 0.313726 ) -border_blend = true -corner_radius_top_left = 50 -corner_radius_top_right = 50 -corner_radius_bottom_right = 30 -corner_radius_bottom_left = 30 -corner_detail = 15 - -[sub_resource type="StyleBoxFlat" id=12] -content_margin_left = 10.0 -content_margin_right = 10.0 -bg_color = Color( 0, 0, 0, 0.313726 ) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_width_bottom = 1 -border_color = Color( 0, 0, 0, 0.392157 ) - -[sub_resource type="StyleBoxFlat" id=11] -content_margin_left = 10.0 -content_margin_right = 10.0 -bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_width_bottom = 1 -border_color = Color( 0, 0, 0, 0.392157 ) - -[sub_resource type="StyleBoxFlat" id=21] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_top = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.313726 ) -corner_radius_top_left = 20 -corner_radius_top_right = 20 -corner_radius_bottom_right = 20 -corner_radius_bottom_left = 20 -corner_detail = 15 - -[sub_resource type="StyleBoxEmpty" id=5] - -[sub_resource type="StyleBoxFlat" id=13] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.588235 ) -border_width_top = 65 -border_color = Color( 0.180392, 0.180392, 0.180392, 1 ) -corner_radius_top_left = 30 -corner_radius_top_right = 30 -corner_radius_bottom_right = 30 -corner_radius_bottom_left = 30 -corner_detail = 15 -expand_margin_top = 65.0 - [sub_resource type="Theme" id=23] default_font = ExtResource( 13 ) -Button/colors/font_color = Color( 1, 1, 1, 1 ) -Button/colors/font_color_disabled = Color( 1, 1, 1, 0.305882 ) -Button/colors/font_color_focus = Color( 1, 1, 1, 1 ) -Button/colors/font_color_hover = Color( 0, 0, 0, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) -Button/styles/disabled = SubResource( 6 ) -Button/styles/focus = ExtResource( 10 ) -Button/styles/hover = ExtResource( 15 ) -Button/styles/normal = ExtResource( 10 ) -Button/styles/pressed = ExtResource( 10 ) -CheckBox/icons/checked = ExtResource( 8 ) -CheckBox/icons/checked_disabled = null -CheckBox/icons/radio_checked = null -CheckBox/icons/radio_checked_disabled = null -CheckBox/icons/radio_unchecked = null -CheckBox/icons/radio_unchecked_disabled = null -CheckBox/icons/unchecked = ExtResource( 12 ) -CheckBox/icons/unchecked_disabled = null -ColorPicker/icons/color_sample = ExtResource( 4 ) -ColorPicker/icons/overbright_indicator = ExtResource( 4 ) -ColorPicker/icons/preset_bg = ExtResource( 4 ) -ColorPicker/icons/screen_picker = ExtResource( 4 ) -ColorPickerButton/colors/font_color = Color( 1, 1, 1, 1 ) -ColorPickerButton/colors/font_color_disabled = Color( 1, 1, 1, 0.301961 ) -ColorPickerButton/colors/font_color_focus = Color( 1, 1, 1, 1 ) -ColorPickerButton/colors/font_color_hover = Color( 1, 1, 1, 1 ) -ColorPickerButton/colors/font_color_pressed = Color( 0.913725, 0.913725, 0.913725, 1 ) -ColorPickerButton/icons/bg = ExtResource( 4 ) HBoxContainer/constants/separation = 15 -HSlider/styles/grabber_area = SubResource( 7 ) -HSlider/styles/grabber_area_highlight = SubResource( 8 ) -HSlider/styles/slider = SubResource( 9 ) -ItemList/colors/font_color = Color( 1, 1, 1, 1 ) -ItemList/colors/font_color_selected = Color( 0.905882, 0.905882, 0.905882, 1 ) -ItemList/styles/bg = SubResource( 4 ) -ItemList/styles/bg_focus = ExtResource( 11 ) -LineEdit/colors/cursor_color = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color_uneditable = Color( 1, 1, 1, 0.67451 ) -LineEdit/styles/focus = ExtResource( 10 ) -LineEdit/styles/normal = ExtResource( 10 ) -LineEdit/styles/read_only = ExtResource( 10 ) -OptionButton/colors/font_color = Color( 1, 1, 1, 1 ) -OptionButton/colors/font_color_focus = Color( 1, 1, 1, 1 ) -OptionButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) -OptionButton/icons/arrow = ExtResource( 4 ) -Panel/styles/panel = ExtResource( 16 ) -PanelContainer/styles/panel = SubResource( 22 ) -PopupMenu/colors/font_color = Color( 1, 1, 1, 1 ) -PopupMenu/colors/font_color_accel = Color( 1, 1, 1, 0.8 ) -PopupMenu/colors/font_color_hover = Color( 1, 1, 1, 1 ) -PopupMenu/colors/font_color_separator = Color( 0.262745, 0.262745, 0.262745, 1 ) -PopupMenu/icons/radio_checked = ExtResource( 4 ) -PopupMenu/icons/radio_unchecked = ExtResource( 4 ) -PopupMenu/styles/hover = SubResource( 3 ) -PopupMenu/styles/panel = ExtResource( 11 ) -PopupPanel/styles/panel = ExtResource( 9 ) -RichTextLabel/colors/default_color = Color( 1, 1, 1, 1 ) -RichTextLabel/fonts/bold_font = ExtResource( 14 ) -RichTextLabel/fonts/bold_italics_font = SubResource( 19 ) -RichTextLabel/fonts/italics_font = SubResource( 19 ) -RichTextLabel/fonts/mono_font = SubResource( 14 ) -RichTextLabel/fonts/normal_font = SubResource( 20 ) -SpinBox/icons/updown = ExtResource( 4 ) -TabContainer/colors/font_color_bg = Color( 0.709804, 0.709804, 0.709804, 0.72549 ) -TabContainer/colors/font_color_fg = Color( 1, 1, 1, 1 ) -TabContainer/styles/panel = SubResource( 10 ) -TabContainer/styles/tab_bg = SubResource( 12 ) -TabContainer/styles/tab_fg = SubResource( 11 ) -TooltipLabel/colors/font_color = Color( 1, 1, 1, 1 ) -TooltipLabel/fonts/font = ExtResource( 14 ) -TooltipPanel/styles/panel = SubResource( 21 ) VBoxContainer/constants/separation = 15 -VScrollBar/styles/scroll = SubResource( 5 ) -WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) -WindowDialog/constants/close_h_ofs = 0 -WindowDialog/constants/close_v_ofs = 0 -WindowDialog/constants/title_height = 60 -WindowDialog/icons/close = ExtResource( 4 ) -WindowDialog/icons/close_highlight = ExtResource( 4 ) -WindowDialog/styles/panel = SubResource( 13 ) [node name="GridMenuButton" type="Button"] margin_right = 12.0 @@ -220,6 +20,7 @@ theme = ExtResource( 2 ) text = "grid menu button" expand_icon = true script = ExtResource( 3 ) +offset = null [node name="Popup" type="PopupPanel" parent="."] margin_right = 50.0 diff --git a/ui/menus/account/Account.gd b/ui/menus/account/Account.gd index 55cd1c1..62c1e37 100644 --- a/ui/menus/account/Account.gd +++ b/ui/menus/account/Account.gd @@ -2,7 +2,7 @@ extends Control onready var flags: PoolStringArray = ["rainbow"] onready var flagchoice: GridMenuButton = $choose/signup/flag -onready var status: InfoLabel = $H/InfoLabel # not a StatusLabel +onready var status: StatusLabel = $H/InfoLabel onready var loading = $LoadingAnimation onready var tabs := { @@ -71,7 +71,7 @@ func _on_signup_result(result: String): func reset(reason: String, reset_creds := true): if reason: - status.set_text(reason, 0) + status.set_text(reason, 5) if reset_creds: Creds.reset() tabcontainer.show() @@ -82,7 +82,8 @@ func reset(reason: String, reset_creds := true): func on_successful(): Creds.save() loading.hide() - status.set_text("Signed in to " + Creds.get("name"), 0) + Log.info("Signed in as %s" % Creds.get("name")) + status.set_text("Signed in as " + Creds.get("name"), 0) signed_in = true # yay $H/LogOut.show() tabcontainer.hide() diff --git a/ui/menus/account/Account.tscn b/ui/menus/account/Account.tscn index fa20b02..53c0846 100644 --- a/ui/menus/account/Account.tscn +++ b/ui/menus/account/Account.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://ui/gridmenu/GridMenuButton.tscn" type="PackedScene" id=1] -[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=2] -[ext_resource path="res://ui/menus/account/InfoLabel.gd" type="Script" id=3] +[ext_resource path="res://assets/blank.png" type="Texture" id=2] +[ext_resource path="res://ui/Status.gd" type="Script" id=3] [ext_resource path="res://ui/menus/account/usernamepass.tscn" type="PackedScene" id=5] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=6] [ext_resource path="res://ui/animations/thehalo.tres" type="Material" id=7] @@ -33,10 +33,10 @@ focus_mode = 0 text = "" [node name="choose" type="TabContainer" parent="."] -margin_left = 177.0 -margin_top = 15.0 -margin_right = 1245.0 -margin_bottom = 570.0 +margin_left = 182.0 +margin_top = 10.0 +margin_right = 1240.0 +margin_bottom = 457.0 size_flags_horizontal = 4 size_flags_vertical = 4 use_hidden_tabs_for_min_size = true @@ -44,10 +44,10 @@ use_hidden_tabs_for_min_size = true [node name="signup" type="VBoxContainer" parent="choose"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 30.0 -margin_top = 86.0 -margin_right = -30.0 -margin_bottom = -30.0 +margin_left = 25.0 +margin_top = 79.0 +margin_right = -25.0 +margin_bottom = -25.0 custom_constants/separation = 5 [node name="usernamepass" parent="choose/signup" instance=ExtResource( 5 )] @@ -60,7 +60,7 @@ margin_bottom = 225.0 margin_left = 389.0 margin_top = 230.0 margin_right = 619.0 -margin_bottom = 332.0 +margin_bottom = 284.0 rect_min_size = Vector2( 230, 0 ) size_flags_horizontal = 4 text = "flag" @@ -68,9 +68,9 @@ offset = Vector2( 50, -400 ) [node name="signupbutton" type="Button" parent="choose/signup"] margin_left = 379.0 -margin_top = 337.0 +margin_top = 289.0 margin_right = 629.0 -margin_bottom = 439.0 +margin_bottom = 343.0 rect_min_size = Vector2( 250, 20 ) hint_tooltip = "sign up" focus_mode = 0 diff --git a/ui/menus/account/InfoLabel.gd b/ui/menus/account/InfoLabel.gd deleted file mode 100644 index 660040c..0000000 --- a/ui/menus/account/InfoLabel.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Label -class_name InfoLabel - - -func set_text(new_text: String, time := 5) -> void: - show() - text = new_text - if time != 0: - yield(get_tree().create_timer(time), "timeout") - text = "" - hide() diff --git a/ui/menus/account/usernamepass.tscn b/ui/menus/account/usernamepass.tscn index 5f0b303..291a3dc 100644 --- a/ui/menus/account/usernamepass.tscn +++ b/ui/menus/account/usernamepass.tscn @@ -1,10 +1,18 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=10 format=2] -[ext_resource path="res://ui/barbutton/big-ubuntu-bold.tres" type="DynamicFont" id=1] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] [ext_resource path="res://ui/menus/account/Secret.gd" type="Script" id=2] [ext_resource path="res://ui/menus/account/Restrict.gd" type="Script" id=3] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=4] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=5] [ext_resource path="res://ui/menus/account/usernamepass.gd" type="Script" id=6] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=7] + +[sub_resource type="DynamicFont" id=2] +size = 60 +font_data = ExtResource( 7 ) +fallback/0 = ExtResource( 1 ) +fallback/1 = ExtResource( 4 ) [sub_resource type="StyleBoxEmpty" id=1] @@ -20,33 +28,33 @@ alignment = 1 script = ExtResource( 6 ) [node name="Username" type="LineEdit" parent="."] -margin_left = 361.0 -margin_top = 288.0 -margin_right = 1061.0 -margin_bottom = 390.0 -rect_min_size = Vector2( 700, 0 ) +margin_left = 511.0 +margin_top = 334.0 +margin_right = 911.0 +margin_bottom = 388.0 +rect_min_size = Vector2( 400, 0 ) size_flags_horizontal = 4 size_flags_vertical = 0 -max_length = 20 +max_length = 15 placeholder_text = "username goes here" caret_blink = true caret_blink_speed = 0.5 script = ExtResource( 3 ) [node name="H" type="HBoxContainer" parent="."] -margin_top = 405.0 +margin_top = 398.0 margin_right = 1422.0 -margin_bottom = 511.0 +margin_bottom = 466.0 mouse_filter = 2 custom_constants/separation = 2 alignment = 1 [node name="Password" type="LineEdit" parent="H"] -margin_left = 207.0 -margin_top = 2.0 -margin_right = 1107.0 -margin_bottom = 104.0 -rect_min_size = Vector2( 900, 0 ) +margin_left = 480.0 +margin_top = 7.0 +margin_right = 880.0 +margin_bottom = 61.0 +rect_min_size = Vector2( 400, 0 ) size_flags_horizontal = 4 size_flags_vertical = 4 max_length = 20 @@ -58,16 +66,15 @@ caret_blink_speed = 0.5 script = ExtResource( 3 ) [node name="Secret" type="Button" parent="H"] -margin_left = 1109.0 -margin_right = 1215.0 -margin_bottom = 106.0 -rect_min_size = Vector2( 106, 106 ) +margin_left = 882.0 +margin_right = 942.0 +margin_bottom = 68.0 focus_mode = 0 custom_colors/font_color_focus = Color( 1, 1, 1, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0.976471, 0.937255, 0.937255, 1 ) custom_colors/font_color_pressed = Color( 1, 1, 1, 1 ) -custom_fonts/font = ExtResource( 1 ) +custom_fonts/font = SubResource( 2 ) custom_styles/hover = SubResource( 1 ) custom_styles/pressed = SubResource( 1 ) custom_styles/focus = SubResource( 1 ) diff --git a/ui/menus/lobby/GameConfig.gd b/ui/menus/lobby/GameConfig.gd index b822146..5f8646c 100644 --- a/ui/menus/lobby/GameConfig.gd +++ b/ui/menus/lobby/GameConfig.gd @@ -1,20 +1,22 @@ extends TabContainer var moves := PoolStringArray() -var white := true setget set_white +var color := true var lobby: Lobby +export(ButtonGroup) var button_group: ButtonGroup + func _ready(): - find_node("SliderButton").connect("toggled", self, "set_white") + button_group.connect("pressed", self, "_button_pressed") -func set_white(new_white: bool) -> void: - white = new_white +func _button_pressed(button: BarTextureButton) -> void: + color = button.name == "White" func _on_Continue_pressed(): - PacketHandler.host_game(PacketHandler.game_code, white, moves) + PacketHandler.host_game(PacketHandler.game_code, color, moves) reset() @@ -30,8 +32,8 @@ func _on_Stop_pressed(): func reset(): moves = [] - white = true - $Advanced/H/Pgn.text = "" + color = true + $"%PgnInput".text = "" hide() diff --git a/ui/menus/lobby/GameConfig.tscn b/ui/menus/lobby/GameConfig.tscn index 66f123a..046e25b 100644 --- a/ui/menus/lobby/GameConfig.tscn +++ b/ui/menus/lobby/GameConfig.tscn @@ -1,81 +1,72 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] -[ext_resource path="res://ui/slider_button/SliderButton.tscn" type="PackedScene" id=2] +[ext_resource path="res://ui/menus/lobby/color.tres" type="ButtonGroup" id=2] [ext_resource path="res://assets/pieces/cburnett/wK.png" type="Texture" id=3] [ext_resource path="res://assets/pieces/cburnett/bK.png" type="Texture" id=4] [ext_resource path="res://ui/menus/lobby/GameConfig.gd" type="Script" id=5] [ext_resource path="res://ui/menus/lobby/PGNEntry.gd" type="Script" id=6] +[ext_resource path="res://ui/barbutton/BarTextureButton.tscn" type="PackedScene" id=7] [node name="GameConfig" type="TabContainer"] anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 1 ) script = ExtResource( 5 ) +button_group = ExtResource( 2 ) [node name="General" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 30.0 -margin_top = 86.0 -margin_right = -30.0 -margin_bottom = -30.0 +margin_left = 25.0 +margin_top = 79.0 +margin_right = -25.0 +margin_bottom = -25.0 [node name="H" type="HBoxContainer" parent="General"] -margin_right = 1362.0 +margin_right = 1372.0 margin_bottom = 100.0 custom_constants/separation = 0 alignment = 1 -[node name="Black" type="TextureRect" parent="General/H"] -margin_left = 481.0 -margin_right = 581.0 +[node name="Black" parent="General/H" instance=ExtResource( 7 )] +margin_left = 586.0 +margin_right = 686.0 margin_bottom = 100.0 rect_min_size = Vector2( 100, 100 ) -texture = ExtResource( 4 ) -expand = true -stretch_mode = 6 +toggle_mode = true +group = ExtResource( 2 ) +texture_normal = ExtResource( 4 ) +pressed_color = Color( 0.576471, 0.631373, 0.631373, 1 ) -[node name="SliderButton" parent="General/H" instance=ExtResource( 2 )] -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 581.0 -margin_top = 25.0 -margin_right = 781.0 -margin_bottom = 75.0 -rect_min_size = Vector2( 200, 50 ) -size_flags_vertical = 4 -on_color = Color( 1, 1, 1, 1 ) -off_color = Color( 0, 0, 0, 1 ) - -[node name="White" type="TextureRect" parent="General/H"] -margin_left = 781.0 -margin_right = 881.0 +[node name="White" parent="General/H" instance=ExtResource( 7 )] +margin_left = 686.0 +margin_right = 786.0 margin_bottom = 100.0 rect_min_size = Vector2( 100, 100 ) -texture = ExtResource( 3 ) -expand = true -stretch_mode = 6 +toggle_mode = true +pressed = true +group = ExtResource( 2 ) +texture_normal = ExtResource( 3 ) +pressed_color = Color( 0.576471, 0.631373, 0.631373, 1 ) [node name="H2" type="HBoxContainer" parent="General"] -margin_top = 115.0 -margin_right = 1362.0 -margin_bottom = 217.0 +margin_top = 110.0 +margin_right = 1372.0 +margin_bottom = 164.0 alignment = 1 [node name="Stop" type="Button" parent="General/H2"] -margin_left = 450.0 -margin_right = 621.0 -margin_bottom = 102.0 +margin_left = 535.0 +margin_right = 642.0 +margin_bottom = 54.0 size_flags_horizontal = 4 text = "exit" [node name="Continue" type="Button" parent="General/H2"] -margin_left = 636.0 -margin_right = 911.0 -margin_bottom = 102.0 +margin_left = 652.0 +margin_right = 836.0 +margin_bottom = 54.0 size_flags_horizontal = 4 text = "continue " @@ -88,24 +79,30 @@ margin_top = 56.0 margin_right = -30.0 margin_bottom = -30.0 -[node name="H" type="HBoxContainer" parent="Advanced"] +[node name="Pgn" type="HBoxContainer" parent="Advanced"] margin_right = 1362.0 -margin_bottom = 102.0 +margin_bottom = 54.0 -[node name="Pgn" type="LineEdit" parent="Advanced/H"] -margin_right = 1297.0 -margin_bottom = 102.0 +[node name="Label" type="Label" parent="Advanced/Pgn"] +margin_right = 40.0 +margin_bottom = 34.0 +text = "pgn: " + +[node name="PgnInput" type="LineEdit" parent="Advanced/Pgn"] +unique_name_in_owner = true +margin_right = 1352.0 +margin_bottom = 54.0 size_flags_horizontal = 3 placeholder_text = "1. e4" script = ExtResource( 6 ) -[node name="Checkmark" type="Label" parent="Advanced/H"] -margin_left = 1312.0 -margin_top = 28.0 -margin_right = 1312.0 -margin_bottom = 74.0 +[node name="Checkmark" type="Label" parent="Advanced/Pgn"] +margin_left = 1362.0 +margin_top = 10.0 +margin_right = 1362.0 +margin_bottom = 44.0 [connection signal="pressed" from="General/H2/Stop" to="." method="_on_Stop_pressed"] [connection signal="pressed" from="General/H2/Continue" to="." method="_on_Continue_pressed"] -[connection signal="pgn_selected" from="Advanced/H/Pgn" to="." method="_on_pgn_selected"] -[connection signal="text_changed" from="Advanced/H/Pgn" to="Advanced/H/Pgn" method="text_changed"] +[connection signal="pgn_selected" from="Advanced/Pgn/PgnInput" to="." method="_on_pgn_selected"] +[connection signal="text_changed" from="Advanced/Pgn/PgnInput" to="Advanced/Pgn/PgnInput" method="text_changed"] diff --git a/ui/menus/lobby/Lobby.tscn b/ui/menus/lobby/Lobby.tscn index bd8099e..3d966df 100644 --- a/ui/menus/lobby/Lobby.tscn +++ b/ui/menus/lobby/Lobby.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/menus/lobby/Lobby.gd" type="Script" id=2] [ext_resource path="res://ui/menus/lobby/GameConfig.tscn" type="PackedScene" id=5] +[sub_resource type="ButtonGroup" id=1] + [node name="Lobby" type="CenterContainer"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -11,14 +13,14 @@ theme = ExtResource( 1 ) script = ExtResource( 2 ) [node name="Center" type="CenterContainer" parent="."] -margin_left = 411.0 -margin_top = 290.0 -margin_right = 1011.0 -margin_bottom = 509.0 +margin_left = 536.0 +margin_top = 341.0 +margin_right = 886.0 +margin_bottom = 459.0 [node name="VBox" type="VBoxContainer" parent="Center"] -margin_right = 600.0 -margin_bottom = 219.0 +margin_right = 350.0 +margin_bottom = 118.0 [node name="GameConfig" parent="Center/VBox" instance=ExtResource( 5 )] visible = false @@ -26,6 +28,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 727.0 margin_bottom = 450.0 +button_group = SubResource( 1 ) [node name="stophost" type="Button" parent="Center/VBox"] unique_name_in_owner = true @@ -36,39 +39,26 @@ focus_mode = 0 size_flags_horizontal = 4 text = "stop hosting" -[node name="Address" type="LineEdit" parent="Center/VBox"] -unique_name_in_owner = true -margin_right = 600.0 -margin_bottom = 102.0 -rect_min_size = Vector2( 600, 0 ) -hint_tooltip = "people will be able to join this gamecode" -focus_mode = 1 -text = "game_code" -align = 1 -max_length = 10 -placeholder_text = "game_code" -caret_blink = true -caret_blink_speed = 0.5 - [node name="buttons" type="HBoxContainer" parent="Center/VBox"] -margin_top = 117.0 -margin_right = 600.0 -margin_bottom = 219.0 +margin_right = 350.0 +margin_bottom = 54.0 [node name="SpectateButton" type="Button" parent="Center/VBox/buttons"] -margin_right = 223.0 -margin_bottom = 102.0 +margin_right = 110.0 +margin_bottom = 54.0 +rect_min_size = Vector2( 110, 0 ) +hint_tooltip = "watch the game" focus_mode = 0 size_flags_horizontal = 3 size_flags_vertical = 3 disabled = true -text = "spectate" +text = "watch" [node name="JoinButton" type="Button" parent="Center/VBox/buttons"] -margin_left = 238.0 -margin_right = 406.0 -margin_bottom = 102.0 -rect_min_size = Vector2( 150, 0 ) +margin_left = 120.0 +margin_right = 230.0 +margin_bottom = 54.0 +rect_min_size = Vector2( 110, 0 ) hint_tooltip = "join the game" focus_mode = 0 size_flags_horizontal = 7 @@ -77,14 +67,30 @@ text = "join" [node name="HostButton" type="Button" parent="Center/VBox/buttons"] unique_name_in_owner = true -margin_left = 421.0 -margin_right = 600.0 -margin_bottom = 102.0 -hint_tooltip = "create a game" +margin_left = 240.0 +margin_right = 350.0 +margin_bottom = 54.0 +rect_min_size = Vector2( 110, 0 ) +hint_tooltip = "host the game" focus_mode = 0 size_flags_horizontal = 7 disabled = true -text = "create" +text = "host" + +[node name="Address" type="LineEdit" parent="Center/VBox"] +unique_name_in_owner = true +margin_top = 64.0 +margin_right = 350.0 +margin_bottom = 118.0 +rect_min_size = Vector2( 200, 0 ) +hint_tooltip = "name the game" +focus_mode = 1 +text = "a_game_name" +align = 1 +max_length = 11 +placeholder_text = "game_name" +caret_blink = true +caret_blink_speed = 0.5 [node name="StatusOK" type="Label" parent="Center/VBox"] unique_name_in_owner = true diff --git a/ui/menus/lobby/color.tres b/ui/menus/lobby/color.tres new file mode 100644 index 0000000..0e55d74 --- /dev/null +++ b/ui/menus/lobby/color.tres @@ -0,0 +1,3 @@ +[gd_resource type="ButtonGroup" format=2] + +[resource] diff --git a/ui/menus/settings/Settings.tscn b/ui/menus/settings/Settings.tscn index b7007f0..da97e8d 100644 --- a/ui/menus/settings/Settings.tscn +++ b/ui/menus/settings/Settings.tscn @@ -15,56 +15,57 @@ theme = ExtResource( 1 ) script = ExtResource( 2 ) [node name="H" type="HBoxContainer" parent="."] -margin_left = 245.0 -margin_top = 126.0 -margin_right = 1177.0 -margin_bottom = 674.0 +margin_left = 308.0 +margin_top = 156.0 +margin_right = 1114.0 +margin_bottom = 644.0 mouse_filter = 2 size_flags_horizontal = 0 size_flags_vertical = 0 alignment = 1 [node name="TabContainer" type="TabContainer" parent="H"] -margin_right = 417.0 -margin_bottom = 470.0 +margin_right = 296.0 +margin_bottom = 292.0 size_flags_vertical = 0 custom_constants/hseparation = 20 drag_to_rearrange_enabled = true use_hidden_tabs_for_min_size = true -[node name="" type="VBoxContainer" parent="H/TabContainer"] +[node name="" type="VBoxContainer" parent="H/TabContainer"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 30.0 -margin_top = 86.0 -margin_right = -30.0 -margin_bottom = -30.0 +margin_left = 25.0 +margin_top = 79.0 +margin_right = -25.0 +margin_bottom = -25.0 alignment = 1 -[node name="boardcolor1" parent="H/TabContainer/" instance=ExtResource( 5 )] -margin_left = 34.0 -margin_right = 322.0 -margin_bottom = 102.0 +[node name="boardcolor1" parent="H/TabContainer/" instance=ExtResource( 5 )] +margin_left = 26.0 +margin_right = 220.0 +margin_bottom = 54.0 size_flags_horizontal = 4 text = "boardcolor1" -[node name="boardcolor2" parent="H/TabContainer/" instance=ExtResource( 5 )] -margin_left = 34.0 -margin_top = 117.0 -margin_right = 322.0 -margin_bottom = 219.0 +[node name="boardcolor2" parent="H/TabContainer/" instance=ExtResource( 5 )] +margin_left = 26.0 +margin_top = 64.0 +margin_right = 220.0 +margin_bottom = 118.0 size_flags_horizontal = 4 text = "boardcolor2" -[node name="PieceSet" parent="H/TabContainer/" instance=ExtResource( 6 )] -margin_left = 28.0 -margin_top = 234.0 -margin_right = 328.0 -margin_bottom = 354.0 -rect_min_size = Vector2( 300, 120 ) +[node name="PieceSet" parent="H/TabContainer/" instance=ExtResource( 6 )] +margin_left = 23.0 +margin_top = 128.0 +margin_right = 223.0 +margin_bottom = 188.0 +rect_min_size = Vector2( 200, 60 ) size_flags_horizontal = 4 text = "piece set" icon = ExtResource( 7 ) +offset = null [node name="" type="VBoxContainer" parent="H/TabContainer"] visible = false @@ -109,12 +110,12 @@ toggle_mode = true text = "borders" script = ExtResource( 3 ) -[node name="misc" type="VBoxContainer" parent="H/TabContainer"] +[node name="" type="VBoxContainer" parent="H/TabContainer"] visible = false margin_right = 40.0 margin_bottom = 40.0 -[node name="rainbow" type="Button" parent="H/TabContainer/misc"] +[node name="rainbow" type="Button" parent="H/TabContainer/"] margin_right = 609.0 margin_bottom = 140.0 focus_mode = 0 @@ -124,31 +125,31 @@ align = 2 script = ExtResource( 3 ) [node name="Container" type="VBoxContainer" parent="H"] -margin_left = 432.0 -margin_right = 932.0 -margin_bottom = 548.0 +margin_left = 306.0 +margin_right = 806.0 +margin_bottom = 488.0 rect_min_size = Vector2( 300, 0 ) custom_constants/separation = 0 [node name="resetbutton" type="Button" parent="H/Container"] -margin_left = 118.0 -margin_right = 382.0 -margin_bottom = 102.0 +margin_left = 162.0 +margin_right = 338.0 +margin_bottom = 54.0 focus_mode = 0 size_flags_horizontal = 4 text = "reset all ﰇ" [node name="PreviewLabel" type="Label" parent="H/Container"] -margin_top = 102.0 +margin_top = 54.0 margin_right = 500.0 -margin_bottom = 148.0 +margin_bottom = 88.0 text = "Preview" align = 1 [node name="Preview" type="GridContainer" parent="H/Container"] -margin_top = 148.0 +margin_top = 88.0 margin_right = 500.0 -margin_bottom = 548.0 +margin_bottom = 488.0 rect_min_size = Vector2( 500, 0 ) size_flags_horizontal = 4 custom_constants/vseparation = 0 @@ -159,13 +160,13 @@ __meta__ = { "_edit_group_": true } -[connection signal="changed" from="H/TabContainer//boardcolor1" to="." method="_on_boardcolor1_changed"] -[connection signal="newcolor" from="H/TabContainer//boardcolor1" to="." method="_on_boardcolor1_newcolor"] -[connection signal="changed" from="H/TabContainer//boardcolor2" to="." method="_on_boardcolor2_changed"] -[connection signal="newcolor" from="H/TabContainer//boardcolor2" to="." method="_on_boardcolor2_newcolor"] -[connection signal="selected" from="H/TabContainer//PieceSet" to="." method="_on_PieceSet_selected"] +[connection signal="changed" from="H/TabContainer//boardcolor1" to="." method="_on_boardcolor1_changed"] +[connection signal="newcolor" from="H/TabContainer//boardcolor1" to="." method="_on_boardcolor1_newcolor"] +[connection signal="changed" from="H/TabContainer//boardcolor2" to="." method="_on_boardcolor2_changed"] +[connection signal="newcolor" from="H/TabContainer//boardcolor2" to="." method="_on_boardcolor2_newcolor"] +[connection signal="selected" from="H/TabContainer//PieceSet" to="." method="_on_PieceSet_selected"] [connection signal="toggled" from="H/TabContainer//FullscreenButton" to="." method="_on_FullscreenButton_toggled"] [connection signal="toggled" from="H/TabContainer//VsyncButton" to="." method="_on_VsyncButton_toggled"] [connection signal="toggled" from="H/TabContainer//Borderless" to="." method="_on_Borderless_toggled"] -[connection signal="toggled" from="H/TabContainer/misc/rainbow" to="." method="_on_rainbow_toggled"] +[connection signal="toggled" from="H/TabContainer//rainbow" to="." method="_on_rainbow_toggled"] [connection signal="pressed" from="H/Container/resetbutton" to="." method="_on_resetbutton_pressed"] diff --git a/ui/menus/sidebarright/OpeningLabel.gd b/ui/menus/sidebarright/OpeningLabel.gd index 47ba3c6..f7845e7 100644 --- a/ui/menus/sidebarright/OpeningLabel.gd +++ b/ui/menus/sidebarright/OpeningLabel.gd @@ -18,11 +18,11 @@ func _ready(): func update_opening(_var := null) -> void: if Utils.internet: - var fen := Globals.grid.chess.fen() + var fen: String = Globals.grid.chess.fen() if fen != Globals.grid.chess.DEFAULT_POSITION && fen != current_req: if current_req: http_request.cancel_request() - text = "" + set_text("") current_req = fen var u = url % fen.replace(" ", "_").http_escape() Log.net(["REQUEST: get opening with url:", u]) @@ -30,7 +30,7 @@ func update_opening(_var := null) -> void: func _request_completed(result, _response_code, _headers, byte_body): - text = "" + set_text("") # empty text and hide self current_req = "" if result != OK: # technically REQUEST_SUCCESS but i cant find it return @@ -39,4 +39,9 @@ func _request_completed(result, _response_code, _headers, byte_body): var response = parse_json(body) if response.opening != null and "name" in response.opening: - text = " %s" % response.opening.name + set_text(" %s" % response.opening.name) + + +func set_text(_text := ""): + visible = _text != "" + text = _text diff --git a/ui/menus/sidebarright/SidebarRight.tscn b/ui/menus/sidebarright/SidebarRight.tscn index 4542487..07654e2 100644 --- a/ui/menus/sidebarright/SidebarRight.tscn +++ b/ui/menus/sidebarright/SidebarRight.tscn @@ -1,64 +1,66 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://ui/menus/sidebarright/drawbutton.gd" type="Script" id=1] [ext_resource path="res://ui/menus/sidebarright/resignbutton.gd" type="Script" id=2] [ext_resource path="res://ui/Status.gd" type="Script" id=3] -[ext_resource path="res://ui/ubuntu.tres" type="DynamicFont" id=4] +[ext_resource path="res://ui/ubuntu-medium.tres" type="DynamicFont" id=4] [ext_resource path="res://ui/barbutton/default_highlight.tres" type="StyleBox" id=5] [ext_resource path="res://ui/barbutton/default_pressed.tres" type="StyleBox" id=6] [ext_resource path="res://ui/barbutton/default.tres" type="StyleBox" id=7] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=8] -[ext_resource path="res://ui/ubuntu-bold.tres" type="DynamicFont" id=9] +[ext_resource path="res://ui/ubuntu-bold-regular.tres" type="DynamicFont" id=8] +[ext_resource path="res://ui/ubuntu-bold-medium.tres" type="DynamicFont" id=9] [ext_resource path="res://ui/menus/sidebarright/OpeningLabel.gd" type="Script" id=10] [ext_resource path="res://ui/menus/sidebarright/material/MaterialLabelManager.gd" type="Script" id=11] [ext_resource path="res://ui/menus/sidebarright/material/MaterialLabel.gd" type="Script" id=12] [ext_resource path="res://ui/menus/sidebarright/SidebarRight.gd" type="Script" id=13] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=14] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=15] [ext_resource path="res://ui/menus/sidebarright/undobutton.gd" type="Script" id=18] [ext_resource path="res://ui/menus/sidebarright/flipbutton.gd" type="Script" id=19] [ext_resource path="res://ui/menus/sidebarright/sandisplay/SanDisplay.tscn" type="PackedScene" id=21] [ext_resource path="res://ui/menus/sidebarright/UserPanel.tscn" type="PackedScene" id=22] -[sub_resource type="StyleBoxFlat" id=9] -bg_color = Color( 0.14902, 0.141176, 0.129412, 0.784314 ) +[sub_resource type="StyleBoxFlat" id=22] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0, 0.168627, 0.211765, 1 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color( 0.027451, 0.211765, 0.258824, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="DynamicFont" id=23] +size = 40 +font_data = ExtResource( 15 ) [sub_resource type="StyleBoxEmpty" id=11] -[sub_resource type="StyleBoxFlat" id=21] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_top = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.694118 ) -corner_radius_top_left = 20 -corner_radius_top_right = 20 -corner_radius_bottom_right = 20 -corner_radius_bottom_left = 20 -corner_detail = 15 - -[sub_resource type="Theme" id=12] -Button/colors/font_color = Color( 1, 1, 1, 1 ) -Button/colors/font_color_disabled = Color( 0.643137, 0.592157, 0.592157, 0.2 ) -Button/colors/font_color_focus = Color( 1, 1, 1, 1 ) -Button/colors/font_color_hover = Color( 1, 1, 1, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) -Button/fonts/font = ExtResource( 9 ) +[sub_resource type="Theme" id=24] +Button/colors/font_color = Color( 0.933333, 0.909804, 0.835294, 1 ) +Button/colors/font_color_disabled = Color( 0.576471, 0.631373, 0.631373, 1 ) +Button/colors/font_color_focus = Color( 0.992157, 0.964706, 0.890196, 1 ) +Button/colors/font_color_hover = Color( 0.992157, 0.964706, 0.890196, 1 ) +Button/colors/font_color_pressed = Color( 0.992157, 0.964706, 0.890196, 1 ) +Button/fonts/font = SubResource( 23 ) Button/styles/disabled = ExtResource( 7 ) Button/styles/focus = SubResource( 11 ) Button/styles/hover = ExtResource( 5 ) Button/styles/normal = ExtResource( 7 ) Button/styles/pressed = ExtResource( 6 ) -TooltipLabel/colors/font_color = Color( 1, 1, 1, 1 ) -TooltipLabel/fonts/font = ExtResource( 8 ) -TooltipPanel/styles/panel = SubResource( 21 ) [node name="SidebarRight" type="PanelContainer"] anchor_right = 1.0 anchor_bottom = 1.0 -rect_min_size = Vector2( 300, 0 ) -size_flags_horizontal = 3 +rect_min_size = Vector2( 320, 0 ) theme = ExtResource( 14 ) -custom_styles/panel = SubResource( 9 ) +custom_styles/panel = SubResource( 22 ) script = ExtResource( 13 ) __meta__ = { "_edit_lock_": true @@ -71,35 +73,39 @@ white_path = NodePath("../V/WhitePanel/WhiteMaterialLabel") black_path = NodePath("../V/BlackPanel/BlackMaterialLabel") [node name="V" type="VBoxContainer" parent="."] -margin_right = 1422.0 -margin_bottom = 800.0 +margin_left = 10.0 +margin_top = 5.0 +margin_right = 1412.0 +margin_bottom = 795.0 custom_constants/separation = 0 alignment = 1 [node name="OpeningLabel" type="Label" parent="V"] -margin_top = 200.0 -margin_right = 1422.0 -margin_bottom = 223.0 +visible = false +margin_top = 176.0 +margin_right = 1402.0 +margin_bottom = 199.0 custom_fonts/font = ExtResource( 8 ) script = ExtResource( 10 ) [node name="BlackPanel" parent="V" instance=ExtResource( 22 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 223.0 -margin_right = 1422.0 -margin_bottom = 263.0 +margin_top = 226.0 +margin_right = 1402.0 +margin_bottom = 270.0 [node name="BlackMaterialLabel" type="HBoxContainer" parent="V/BlackPanel"] -margin_right = 1422.0 -margin_bottom = 40.0 +margin_top = 2.0 +margin_right = 1402.0 +margin_bottom = 42.0 alignment = 2 script = ExtResource( 12 ) -[node name="buttonbarholder" type="PanelContainer" parent="V"] -margin_top = 263.0 -margin_right = 1422.0 -margin_bottom = 313.0 +[node name="buttonbarholder" type="MarginContainer" parent="V"] +margin_top = 270.0 +margin_right = 1402.0 +margin_bottom = 320.0 rect_min_size = Vector2( 50, 50 ) __meta__ = { "_edit_group_": true, @@ -107,14 +113,14 @@ __meta__ = { } [node name="buttonbar" type="HBoxContainer" parent="V/buttonbarholder"] -margin_right = 1422.0 +margin_right = 1402.0 margin_bottom = 50.0 -theme = SubResource( 12 ) +theme = SubResource( 24 ) custom_constants/separation = 0 alignment = 1 [node name="FlipButton" type="Button" parent="V/buttonbarholder/buttonbar"] -margin_right = 355.0 +margin_right = 350.0 margin_bottom = 50.0 hint_tooltip = "flip the board" focus_mode = 0 @@ -125,8 +131,8 @@ text = "ﮨ" script = ExtResource( 19 ) [node name="DrawButton" type="Button" parent="V/buttonbarholder/buttonbar"] -margin_left = 355.0 -margin_right = 711.0 +margin_left = 350.0 +margin_right = 701.0 margin_bottom = 50.0 rect_min_size = Vector2( 0, 50 ) hint_tooltip = "request a draw" @@ -139,8 +145,8 @@ script = ExtResource( 1 ) confirm_text = "Your opponent requests a draw" [node name="ResignButton" type="Button" parent="V/buttonbarholder/buttonbar"] -margin_left = 711.0 -margin_right = 1066.0 +margin_left = 701.0 +margin_right = 1051.0 margin_bottom = 50.0 rect_min_size = Vector2( 0, 50 ) hint_tooltip = "resign" @@ -152,8 +158,8 @@ script = ExtResource( 2 ) confirm_text = "Resign?" [node name="UndoButton" type="Button" parent="V/buttonbarholder/buttonbar"] -margin_left = 1066.0 -margin_right = 1422.0 +margin_left = 1051.0 +margin_right = 1402.0 margin_bottom = 50.0 rect_min_size = Vector2( 0, 50 ) hint_tooltip = "request a undo" @@ -168,28 +174,30 @@ status = NodePath("../../../Status") [node name="SanDisplay" parent="V" instance=ExtResource( 21 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 313.0 -margin_right = 1422.0 -margin_bottom = 513.0 +margin_top = 320.0 +margin_right = 1402.0 +margin_bottom = 520.0 rect_min_size = Vector2( 0, 200 ) [node name="WhitePanel" parent="V" instance=ExtResource( 22 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 513.0 -margin_right = 1422.0 -margin_bottom = 553.0 +margin_top = 520.0 +margin_right = 1402.0 +margin_bottom = 564.0 [node name="WhiteMaterialLabel" type="HBoxContainer" parent="V/WhitePanel"] -margin_right = 1422.0 -margin_bottom = 40.0 +margin_top = 2.0 +margin_right = 1402.0 +margin_bottom = 42.0 alignment = 2 script = ExtResource( 12 ) [node name="Status" type="Label" parent="V"] -margin_top = 553.0 -margin_right = 1422.0 -margin_bottom = 599.0 +visible = false +margin_top = 549.0 +margin_right = 1402.0 +margin_bottom = 583.0 align = 1 autowrap = true script = ExtResource( 3 ) diff --git a/ui/menus/sidebarright/UserPanel.gd b/ui/menus/sidebarright/UserPanel.gd index 57b8a92..0911332 100644 --- a/ui/menus/sidebarright/UserPanel.gd +++ b/ui/menus/sidebarright/UserPanel.gd @@ -1,8 +1,8 @@ -extends PanelContainer +extends MarginContainer class_name UserPanel -onready var flag_display = $MC/H/Flag -onready var name_display = $MC/H/Name +onready var flag_display = $"%Flag" +onready var name_display = $"%Name" var flag := "rainbow" setget set_flag var _name := "name" setget set_name diff --git a/ui/menus/sidebarright/UserPanel.tscn b/ui/menus/sidebarright/UserPanel.tscn index a3cbbad..c02e0c0 100644 --- a/ui/menus/sidebarright/UserPanel.tscn +++ b/ui/menus/sidebarright/UserPanel.tscn @@ -1,51 +1,44 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=1] +[ext_resource path="res://ui/ubuntu-bold-regular.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/flags/rainbow.png" type="Texture" id=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=3] [ext_resource path="res://ui/menus/sidebarright/UserPanel.gd" type="Script" id=4] -[node name="UserPanel" type="PanelContainer"] +[node name="UserPanel" type="MarginContainer"] anchor_right = 1.0 anchor_bottom = 1.0 rect_min_size = Vector2( 0, 40 ) theme = ExtResource( 3 ) +custom_constants/margin_top = 2 +custom_constants/margin_bottom = 2 script = ExtResource( 4 ) -[node name="MC" type="MarginContainer" parent="."] +[node name="H" type="HBoxContainer" parent="."] +margin_top = 2.0 margin_right = 1422.0 -margin_bottom = 800.0 -custom_constants/margin_left = 10 - -[node name="H" type="HBoxContainer" parent="MC"] -margin_left = 10.0 -margin_right = 1422.0 -margin_bottom = 800.0 +margin_bottom = 798.0 custom_constants/separation = 10 -[node name="Name" type="Label" parent="MC/H"] -margin_top = 380.0 -margin_right = 61.0 -margin_bottom = 420.0 +[node name="Name" type="Label" parent="H"] +unique_name_in_owner = true +margin_top = 378.0 +margin_right = 52.0 +margin_bottom = 418.0 rect_min_size = Vector2( 0, 40 ) custom_fonts/font = ExtResource( 1 ) text = "name" valign = 1 -[node name="Flag" type="TextureRect" parent="MC/H"] -margin_left = 71.0 -margin_top = 390.0 -margin_right = 97.0 -margin_bottom = 410.0 +[node name="Flag" type="TextureRect" parent="H"] +unique_name_in_owner = true +margin_left = 62.0 +margin_top = 388.0 +margin_right = 88.0 +margin_bottom = 408.0 rect_min_size = Vector2( 26, 20 ) size_flags_horizontal = 4 size_flags_vertical = 4 texture = ExtResource( 2 ) expand = true stretch_mode = 6 - -[node name="Spacer2" type="Control" parent="MC/H"] -margin_left = 107.0 -margin_right = 1412.0 -margin_bottom = 800.0 -size_flags_horizontal = 3 diff --git a/ui/menus/sidebarright/confirmbutton.gd b/ui/menus/sidebarright/confirmbutton.gd index 3d596eb..9f9eea3 100644 --- a/ui/menus/sidebarright/confirmbutton.gd +++ b/ui/menus/sidebarright/confirmbutton.gd @@ -11,8 +11,8 @@ func _ready() -> void: PacketHandler.connect("signal_recieved", self, "_signal_recieved") -func disable(_a: String, _ar: bool) -> void: - disabled = true +func disable(_a: String) -> void: + set_disabled(true) func _signal_recieved(_signal: Dictionary) -> void: diff --git a/ui/menus/sidebarright/material/MaterialLabel.gd b/ui/menus/sidebarright/material/MaterialLabel.gd index e6ad54c..68931f4 100644 --- a/ui/menus/sidebarright/material/MaterialLabel.gd +++ b/ui/menus/sidebarright/material/MaterialLabel.gd @@ -7,7 +7,7 @@ var l := Label.new() func _ready(): add_constant_override("separation", 0) add_child(l) - l.add_font_override("font", load("res://ui/ubuntu-bold-small.tres")) + l.add_font_override("font", load("res://ui/ubuntu-bold-regular.tres")) l.name = "Label" diff --git a/ui/menus/sidebarright/sandisplay/Base.tscn b/ui/menus/sidebarright/sandisplay/Base.tscn index 65339bf..0c4d096 100644 --- a/ui/menus/sidebarright/sandisplay/Base.tscn +++ b/ui/menus/sidebarright/sandisplay/Base.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://ui/menus/sidebarright/sandisplay/Base.gd" type="Script" id=1] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=2] +[ext_resource path="res://ui/ubuntu-bold-regular.tres" type="DynamicFont" id=2] [node name="Base" type="HBoxContainer"] anchor_right = 1.0 @@ -11,36 +11,36 @@ custom_constants/separation = 0 script = ExtResource( 1 ) [node name="Number" type="ColorRect" parent="."] -margin_right = 100.0 +margin_right = 75.0 margin_bottom = 800.0 -rect_min_size = Vector2( 100, 25 ) +rect_min_size = Vector2( 75, 25 ) mouse_filter = 2 -color = Color( 0.368627, 0.356863, 0.341176, 1 ) +color = Color( 0.027451, 0.211765, 0.258824, 1 ) [node name="Number" type="Label" parent="Number"] anchor_right = 1.0 anchor_bottom = 1.0 -rect_min_size = Vector2( 100, 25 ) +rect_min_size = Vector2( 75, 25 ) custom_fonts/font = ExtResource( 2 ) align = 1 valign = 1 [node name="Spacer" type="ColorRect" parent="."] -margin_left = 100.0 -margin_right = 110.0 +margin_left = 75.0 +margin_right = 85.0 margin_bottom = 800.0 rect_min_size = Vector2( 10, 25 ) mouse_filter = 2 -color = Color( 0.188235, 0.180392, 0.172549, 1 ) +color = Color( 0, 0.168627, 0.211765, 1 ) [node name="San1" type="ColorRect" parent="."] -margin_left = 110.0 -margin_right = 761.0 +margin_left = 85.0 +margin_right = 748.0 margin_bottom = 800.0 rect_min_size = Vector2( 100, 25 ) mouse_filter = 2 size_flags_horizontal = 3 -color = Color( 0.188235, 0.180392, 0.172549, 1 ) +color = Color( 0, 0.168627, 0.211765, 1 ) [node name="San1" type="Label" parent="San1"] anchor_right = 1.0 @@ -51,13 +51,13 @@ custom_fonts/font = ExtResource( 2 ) valign = 1 [node name="San2" type="ColorRect" parent="."] -margin_left = 761.0 +margin_left = 748.0 margin_right = 1412.0 margin_bottom = 800.0 rect_min_size = Vector2( 100, 25 ) mouse_filter = 2 size_flags_horizontal = 3 -color = Color( 0.188235, 0.180392, 0.172549, 1 ) +color = Color( 0, 0.168627, 0.211765, 1 ) [node name="San2" type="Label" parent="San2"] anchor_right = 1.0 @@ -74,4 +74,4 @@ margin_right = 1422.0 margin_bottom = 800.0 rect_min_size = Vector2( 10, 25 ) mouse_filter = 2 -color = Color( 0.188235, 0.180392, 0.172549, 1 ) +color = Color( 0, 0.168627, 0.211765, 1 ) diff --git a/ui/menus/sidebarright/sandisplay/SanDisplay.gd b/ui/menus/sidebarright/sandisplay/SanDisplay.gd index e45859f..0c17890 100644 --- a/ui/menus/sidebarright/sandisplay/SanDisplay.gd +++ b/ui/menus/sidebarright/sandisplay/SanDisplay.gd @@ -50,6 +50,7 @@ func add_moves(moves: PoolStringArray) -> void: func scroll_down(): + yield(get_tree(), "idle_frame") tween.interpolate_property(scroll_bar, "value", scroll_bar.value, scroll_bar.max_value, 0.5, 9) # bouncy tween.start() diff --git a/ui/menus/sidebarright/sandisplay/SanDisplay.tscn b/ui/menus/sidebarright/sandisplay/SanDisplay.tscn index a06fe11..bfb08dd 100644 --- a/ui/menus/sidebarright/sandisplay/SanDisplay.tscn +++ b/ui/menus/sidebarright/sandisplay/SanDisplay.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] +[ext_resource path="res://ui/theme/flatpanel.tres" type="StyleBox" id=2] [ext_resource path="res://ui/menus/sidebarright/sandisplay/SanDisplay.gd" type="Script" id=8] [ext_resource path="res://ui/menus/sidebarright/sandisplay/Base.tscn" type="PackedScene" id=10] @@ -9,12 +10,14 @@ anchor_right = 1.0 anchor_bottom = 1.0 hint_tooltip = "click to copy pgn" theme = ExtResource( 1 ) +custom_styles/panel = ExtResource( 2 ) script = ExtResource( 8 ) Base = ExtResource( 10 ) [node name="Scroller" type="ScrollContainer" parent="."] +margin_top = 10.0 margin_right = 1422.0 -margin_bottom = 800.0 +margin_bottom = 790.0 mouse_filter = 1 scroll_horizontal_enabled = false __meta__ = { diff --git a/ui/menus/startmenu/StartMenu.tscn b/ui/menus/startmenu/StartMenu.tscn index 1fadbc7..3e3cd1a 100644 --- a/ui/menus/startmenu/StartMenu.tscn +++ b/ui/menus/startmenu/StartMenu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=1] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=2] [ext_resource path="res://ui/menus/startmenu/StartMenu.gd" type="Script" id=3] -[ext_resource path="res://ui/ubuntu-bold-small.tres" type="DynamicFont" id=4] +[ext_resource path="res://ui/ubuntu-bold-regular.tres" type="DynamicFont" id=4] [ext_resource path="res://ui/menus/lobby/Lobby.tscn" type="PackedScene" id=5] [ext_resource path="res://ui/menus/tests/test_runner.tscn" type="PackedScene" id=6] [ext_resource path="res://ui/menus/settings/Settings.tscn" type="PackedScene" id=7] @@ -28,10 +28,10 @@ mouse_filter = 2 theme = ExtResource( 2 ) [node name="tabs" type="TabContainer" parent="CenterContainer"] -margin_left = 147.0 -margin_top = 57.0 -margin_right = 1275.0 -margin_bottom = 743.0 +margin_left = 283.0 +margin_top = 104.0 +margin_right = 1139.0 +margin_bottom = 696.0 rect_min_size = Vector2( 2, 2 ) mouse_filter = 1 size_flags_horizontal = 0 @@ -39,11 +39,11 @@ size_flags_vertical = 0 drag_to_rearrange_enabled = true use_hidden_tabs_for_min_size = true -[node name="" parent="CenterContainer/tabs" instance=ExtResource( 5 )] -margin_left = 30.0 -margin_top = 86.0 -margin_right = -30.0 -margin_bottom = -30.0 +[node name="" parent="CenterContainer/tabs" instance=ExtResource( 5 )] +margin_left = 25.0 +margin_top = 79.0 +margin_right = -25.0 +margin_bottom = -25.0 [node name="漣" parent="CenterContainer/tabs" instance=ExtResource( 7 )] visible = false diff --git a/ui/menus/tests/test_runner.tscn b/ui/menus/tests/test_runner.tscn index 88abb39..f6eaa7c 100644 --- a/ui/menus/tests/test_runner.tscn +++ b/ui/menus/tests/test_runner.tscn @@ -1,11 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://ui/theme/main.theme" type="Theme" id=1] [ext_resource path="res://ui/menus/tests/tests.gd" type="Script" id=2] [ext_resource path="res://ui/menus/tests/engine_test.gd" type="Script" id=3] -[sub_resource type="StyleBoxEmpty" id=1] - [node name="tests" type="VBoxContainer"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -14,83 +12,53 @@ script = ExtResource( 2 ) pgns = PoolStringArray( "1.Nf3 Nf6 2.c4 g6 3.Nc3 Bg7 4.d4 O-O 5.Bf4 d5 6.Qb3 dxc4 7.Qxc4 c6 8.e4 Nbd7 9.Rd1 Nb6 10.Qc5 Bg4 11.Bg5 Na4 12.Qa3 Nxc3 13.bxc3 Nxe4 14.Bxe7 Qb6 15.Bc4 Nxc3 16.Bc5 Rfe8+ 17.Kf1 Be6 18.Bxb6 Bxc4+ 19.Kg1 Ne2+ 20.Kf1 Nxd4+ 21.Kg1 Ne2+ 22.Kf1 Nc3+ 23.Kg1 axb6 24.Qb4 Ra4 25.Qxb6 Nxd1 26.h3 Rxa2 27.Kh2 Nxf2 28.Re1 Rxe1 29.Qd8+ Bf8 30.Nxe1 Bd5 31.Nf3 Ne4 32.Qb8 b5 33.h4 h5 34.Ne5 Kg7 35.Kg1 Bc5+ 36.Kf1 Ng3+ 37.Ke1 Bb4+ 38.Kd1 Bb3+ 39.Kc1 Ne2+ 40.Kb1 Nc3+ 41.Kc1 Rc2# 0-1", "1. e4 e5 2. Nf3 Nc6 3. Bb5 Bc5 4. O-O Nf6 5. Nc3 Nb4 6. Nxe5 c6 7. Bc4 d5 8. exd5 cxd5 9. Bb5+ Bd7 10. Bxd7+ Nxd7 11. Nxd7 Qxd7 12. Re1+ Be7 13. a3 Nc6 14. d4 O-O-O 15. h3 Bh4 16. Qh5 Bf6 17. Nb5 Nxd4 18. Nxa7+ Kb8 19. Bg5 Nxc2 20. Bxf6 gxf6 21. a4 Kxa7 22. Qe2 Nxe1 23. Qxe1 Rhe8 24. Qa5+ Kb8 25. Qb4 d4 26. a5 Re6", "1. e4 f5 2. Qh5+", "1. f4 e5 2. e4 Qh4+" ) [node name="gameofthecentury" type="Button" parent="."] -margin_left = 517.0 -margin_right = 904.0 -margin_bottom = 46.0 +margin_left = 555.0 +margin_right = 866.0 +margin_bottom = 54.0 focus_mode = 0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "game of the century" [node name="test sign" type="Button" parent="."] -margin_left = 646.0 -margin_top = 61.0 -margin_right = 775.0 -margin_bottom = 107.0 +margin_left = 652.0 +margin_top = 64.0 +margin_right = 769.0 +margin_bottom = 118.0 focus_mode = 0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "ﭧ sign" [node name="test check" type="Button" parent="."] -margin_left = 563.0 -margin_top = 122.0 -margin_right = 859.0 -margin_bottom = 168.0 +margin_left = 589.0 +margin_top = 128.0 +margin_right = 833.0 +margin_bottom = 182.0 focus_mode = 0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "ﭧ check(white)" [node name="test check2" type="Button" parent="."] -margin_left = 566.0 -margin_top = 183.0 -margin_right = 856.0 -margin_bottom = 229.0 +margin_left = 592.0 +margin_top = 192.0 +margin_right = 830.0 +margin_bottom = 246.0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "ﭧ check(black)" [node name="test chat" type="Button" parent="."] margin_left = 671.0 -margin_top = 244.0 +margin_top = 256.0 margin_right = 751.0 -margin_bottom = 290.0 +margin_bottom = 310.0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "ﭧ" [node name="engine tests" type="Button" parent="."] -margin_left = 555.0 -margin_top = 305.0 -margin_right = 867.0 -margin_bottom = 351.0 +margin_left = 583.0 +margin_top = 320.0 +margin_right = 839.0 +margin_bottom = 374.0 size_flags_horizontal = 4 -custom_styles/hover = SubResource( 1 ) -custom_styles/pressed = SubResource( 1 ) -custom_styles/focus = SubResource( 1 ) -custom_styles/disabled = SubResource( 1 ) -custom_styles/normal = SubResource( 1 ) text = "run engine tests" script = ExtResource( 3 ) diff --git a/ui/slider_button/slider.tres b/ui/slider_button/slider.tres index 5db8557..9169e65 100644 --- a/ui/slider_button/slider.tres +++ b/ui/slider_button/slider.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=4 format=2] -[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=1] +[ext_resource path="res://assets/blank.png" type="Texture" id=1] [sub_resource type="StyleBoxFlat" id=23] bg_color = Color( 0.588235, 0.360784, 0.360784, 1 ) diff --git a/ui/theme/button.tres b/ui/theme/button.tres deleted file mode 100644 index 1c3469c..0000000 --- a/ui/theme/button.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="StyleBoxTexture" load_steps=2 format=2] - -[ext_resource path="res://assets/ui/button.png" type="Texture" id=1] - -[resource] -texture = ExtResource( 1 ) -region_rect = Rect2( 0, 0, 84, 84 ) -margin_left = 28.0 -margin_right = 28.0 -margin_top = 28.0 -margin_bottom = 28.0 diff --git a/ui/theme/button/button.tres b/ui/theme/button/button.tres new file mode 100644 index 0000000..3e86065 --- /dev/null +++ b/ui/theme/button/button.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.027451, 0.211765, 0.258824, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.576471, 0.631373, 0.631373, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/ui/theme/button/buttondisabled.tres b/ui/theme/button/buttondisabled.tres new file mode 100644 index 0000000..25fe97f --- /dev/null +++ b/ui/theme/button/buttondisabled.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.345098, 0.431373, 0.458824, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/ui/theme/button/buttonhover.tres b/ui/theme/button/buttonhover.tres new file mode 100644 index 0000000..000dfcd --- /dev/null +++ b/ui/theme/button/buttonhover.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.345098, 0.431373, 0.458824, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.576471, 0.631373, 0.631373, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/ui/theme/button/buttonpressed.tres b/ui/theme/button/buttonpressed.tres new file mode 100644 index 0000000..276c946 --- /dev/null +++ b/ui/theme/button/buttonpressed.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.14902, 0.545098, 0.823529, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.992157, 0.964706, 0.890196, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/ui/theme/buttonhover.tres b/ui/theme/buttonhover.tres deleted file mode 100644 index b471acc..0000000 --- a/ui/theme/buttonhover.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="StyleBoxTexture" load_steps=2 format=2] - -[ext_resource path="res://assets/ui/buttonhover.png" type="Texture" id=1] - -[resource] -texture = ExtResource( 1 ) -region_rect = Rect2( 0, 0, 84, 84 ) -margin_left = 28.0 -margin_right = 28.0 -margin_top = 28.0 -margin_bottom = 28.0 diff --git a/ui/theme/flatblack.tres b/ui/theme/flatblack.tres deleted file mode 100644 index 9aefd64..0000000 --- a/ui/theme/flatblack.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="StyleBoxFlat" format=2] - -[resource] -content_margin_left = 10.0 -content_margin_right = 10.0 -bg_color = Color( 0, 0, 0, 0.882353 ) -corner_detail = 20 diff --git a/ui/theme/transblack.tres b/ui/theme/flatpanel.tres index 020e585..495bc37 100644 --- a/ui/theme/transblack.tres +++ b/ui/theme/flatpanel.tres @@ -1,8 +1,6 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0, 0, 0, 0.313726 ) +bg_color = Color( 0, 0.168627, 0.211765, 1 ) diff --git a/ui/theme/main.theme b/ui/theme/main.theme Binary files differindex 3894050..de9bb9e 100644 --- a/ui/theme/main.theme +++ b/ui/theme/main.theme diff --git a/ui/theme/panel.tres b/ui/theme/panel.tres index 1651cef..4c8d635 100644 --- a/ui/theme/panel.tres +++ b/ui/theme/panel.tres @@ -1,4 +1,17 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -bg_color = Color( 0.188235, 0.180392, 0.172549, 1 ) +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 1 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color( 0.027451, 0.211765, 0.258824, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 diff --git a/ui/theme/richtextlabel/tiny-Cascadia-Code.tres b/ui/theme/richtextlabel/tiny-Cascadia-Code.tres deleted file mode 100644 index 236e0cc..0000000 --- a/ui/theme/richtextlabel/tiny-Cascadia-Code.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/CascadiaCode.ttf" type="DynamicFontData" id=3] - -[resource] -size = 20 -font_data = ExtResource( 3 ) -fallback/0 = ExtResource( 2 ) -fallback/1 = ExtResource( 1 ) diff --git a/ui/theme/richtextlabel/tiny-bold-italic.tres b/ui/theme/richtextlabel/tiny-bold-italic.tres deleted file mode 100644 index 98694cf..0000000 --- a/ui/theme/richtextlabel/tiny-bold-italic.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold-italic.ttf" type="DynamicFontData" id=3] - -[resource] -size = 20 -font_data = ExtResource( 3 ) -fallback/0 = ExtResource( 2 ) -fallback/1 = ExtResource( 1 ) diff --git a/ui/theme/richtextlabel/tiny-bold.tres b/ui/theme/richtextlabel/tiny-bold.tres deleted file mode 100644 index 1c10fc1..0000000 --- a/ui/theme/richtextlabel/tiny-bold.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] - -[resource] -size = 20 -font_data = ExtResource( 1 ) -fallback/0 = ExtResource( 3 ) -fallback/1 = ExtResource( 2 ) diff --git a/ui/theme/richtextlabel/tiny-italic.tres b/ui/theme/richtextlabel/tiny-italic.tres deleted file mode 100644 index 051f01b..0000000 --- a/ui/theme/richtextlabel/tiny-italic.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/ubuntu/ubuntu-italic.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] - -[resource] -size = 20 -font_data = ExtResource( 1 ) -fallback/0 = ExtResource( 3 ) -fallback/1 = ExtResource( 2 ) diff --git a/ui/theme/richtextlabel/tiny.tres b/ui/theme/richtextlabel/tiny.tres deleted file mode 100644 index 9c9d18d..0000000 --- a/ui/theme/richtextlabel/tiny.tres +++ /dev/null @@ -1,9 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=3 format=2] - -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] - -[resource] -size = 20 -font_data = ExtResource( 2 ) -fallback/0 = ExtResource( 1 ) diff --git a/ui/theme/scrollbar/grabber-highlight.tres b/ui/theme/scrollbar/grabber-highlight.tres new file mode 100644 index 0000000..5c0e541 --- /dev/null +++ b/ui/theme/scrollbar/grabber-highlight.tres @@ -0,0 +1,14 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 2.0 +content_margin_right = 2.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.576471, 0.631373, 0.631373, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 +expand_margin_left = 1.0 +expand_margin_right = 1.0 diff --git a/ui/theme/scrollbar/grabber-pressed.tres b/ui/theme/scrollbar/grabber-pressed.tres new file mode 100644 index 0000000..b086318 --- /dev/null +++ b/ui/theme/scrollbar/grabber-pressed.tres @@ -0,0 +1,14 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 2.0 +content_margin_right = 2.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.513726, 0.580392, 0.588235, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 +expand_margin_left = 1.0 +expand_margin_right = 1.0 diff --git a/ui/theme/scrollbar/grabber.tres b/ui/theme/scrollbar/grabber.tres new file mode 100644 index 0000000..97a0125 --- /dev/null +++ b/ui/theme/scrollbar/grabber.tres @@ -0,0 +1,14 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 2.0 +content_margin_right = 2.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.345098, 0.431373, 0.458824, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 +expand_margin_left = 1.0 +expand_margin_right = 1.0 diff --git a/ui/theme/scrollbar/scroll.tres b/ui/theme/scrollbar/scroll.tres new file mode 100644 index 0000000..f7a69ac --- /dev/null +++ b/ui/theme/scrollbar/scroll.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 2.0 +content_margin_right = 2.0 +bg_color = Color( 0.027451, 0.211765, 0.258824, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/ui/theme/transpanel.tres b/ui/theme/transpanel.tres new file mode 100644 index 0000000..e658f96 --- /dev/null +++ b/ui/theme/transpanel.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0, 0.168627, 0.211765, 0.392157 ) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color( 0.0286, 0.21372, 0.26, 0.588235 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 diff --git a/ui/ubuntu-bold-italic-regular.tres b/ui/ubuntu-bold-italic-regular.tres new file mode 100644 index 0000000..37d2415 --- /dev/null +++ b/ui/ubuntu-bold-italic-regular.tres @@ -0,0 +1,11 @@ +[gd_resource type="DynamicFont" load_steps=4 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold-italic.ttf" type="DynamicFontData" id=3] + +[resource] +size = 20 +font_data = ExtResource( 3 ) +fallback/0 = ExtResource( 1 ) +fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-bold-medium.tres b/ui/ubuntu-bold-medium.tres new file mode 100644 index 0000000..b6cc643 --- /dev/null +++ b/ui/ubuntu-bold-medium.tres @@ -0,0 +1,11 @@ +[gd_resource type="DynamicFont" load_steps=4 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=3] + +[resource] +size = 30 +font_data = ExtResource( 3 ) +fallback/0 = ExtResource( 1 ) +fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-bold-regular.tres b/ui/ubuntu-bold-regular.tres new file mode 100644 index 0000000..00c909b --- /dev/null +++ b/ui/ubuntu-bold-regular.tres @@ -0,0 +1,11 @@ +[gd_resource type="DynamicFont" load_steps=4 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] + +[resource] +size = 20 +font_data = ExtResource( 1 ) +fallback/0 = ExtResource( 3 ) +fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-bold-small.tres b/ui/ubuntu-bold-small.tres deleted file mode 100644 index 1c10fc1..0000000 --- a/ui/ubuntu-bold-small.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=3] - -[resource] -size = 20 -font_data = ExtResource( 1 ) -fallback/0 = ExtResource( 3 ) -fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-bold.tres b/ui/ubuntu-bold.tres deleted file mode 100644 index d276fc6..0000000 --- a/ui/ubuntu-bold.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=4 format=2] - -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-bold.ttf" type="DynamicFontData" id=3] - -[resource] -size = 40 -font_data = ExtResource( 3 ) -fallback/0 = ExtResource( 1 ) -fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-italic-regular.tres b/ui/ubuntu-italic-regular.tres new file mode 100644 index 0000000..9a99f2a --- /dev/null +++ b/ui/ubuntu-italic-regular.tres @@ -0,0 +1,11 @@ +[gd_resource type="DynamicFont" load_steps=4 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-italic.ttf" type="DynamicFontData" id=3] + +[resource] +size = 20 +font_data = ExtResource( 3 ) +fallback/0 = ExtResource( 1 ) +fallback/1 = ExtResource( 2 ) diff --git a/ui/ubuntu-medium.tres b/ui/ubuntu-medium.tres new file mode 100644 index 0000000..96f4d2b --- /dev/null +++ b/ui/ubuntu-medium.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=3 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] + +[resource] +size = 30 +font_data = ExtResource( 1 ) +fallback/0 = ExtResource( 2 ) diff --git a/ui/ubuntu-regular.tres b/ui/ubuntu-regular.tres new file mode 100644 index 0000000..c79d4f5 --- /dev/null +++ b/ui/ubuntu-regular.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=3 format=2] + +[ext_resource path="res://assets/fonts/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/migu.ttf" type="DynamicFontData" id=2] + +[resource] +size = 20 +font_data = ExtResource( 1 ) +fallback/0 = ExtResource( 2 ) diff --git a/ui/ubuntu.tres b/ui/ubuntu.tres deleted file mode 100644 index 400cdc0..0000000 --- a/ui/ubuntu.tres +++ /dev/null @@ -1,9 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=3 format=2] - -[ext_resource path="res://assets/ui/migu.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://assets/ui/ubuntu/ubuntu-normal-nerd.ttf" type="DynamicFontData" id=2] - -[resource] -size = 40 -font_data = ExtResource( 2 ) -fallback/0 = ExtResource( 1 ) |
