From 489768fcf98234c9ff7ac10cd38a0c00db054a5e Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Sat, 1 Dec 2018 17:50:17 +0900 Subject: [PATCH] Improve the look of the rewards panel Make default.theme's panel background transparent The panel now takes the width of the screen and anchors to the top of the window closes #78 --- godot/combat/CombatArena.tscn | 20 +++++++++---------- godot/interface/theme/slider/slider.stylebox | Bin 493 -> 525 bytes 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/godot/combat/CombatArena.tscn b/godot/combat/CombatArena.tscn index 6f6ecfb..c626cb1 100644 --- a/godot/combat/CombatArena.tscn +++ b/godot/combat/CombatArena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://combat/CombatArena.gd" type="Script" id=1] [ext_resource path="res://combat/turn_queue/TurnQueue.tscn" type="PackedScene" id=2] @@ -7,7 +7,8 @@ [ext_resource path="res://combat/interface/SelectArrow.tscn" type="PackedScene" id=5] [ext_resource path="res://combat/interface/bars/BattlersBarsBuilder.tscn" type="PackedScene" id=6] [ext_resource path="res://combat/Rewards.gd" type="Script" id=7] -[ext_resource path="res://combat/background/Grasslands.tscn" type="PackedScene" id=8] +[ext_resource path="res://interface/default.theme" type="Theme" id=8] +[ext_resource path="res://combat/background/Grasslands.tscn" type="PackedScene" id=9] [node name="CombatArena" type="Node2D"] script = ExtResource( 1 ) @@ -45,7 +46,6 @@ buttons_offset = null [node name="BattlersBarsBuilder" parent="CombatInterface" instance=ExtResource( 6 )] [node name="Rewards" type="CanvasLayer" parent="."] -editor/display_folded = true layer = 1 offset = Vector2( 0, 0 ) rotation = 0.0 @@ -54,21 +54,19 @@ transform = Transform2D( 1, 0, 0, 1, 0, 0 ) script = ExtResource( 7 ) [node name="Panel" type="Panel" parent="Rewards"] -visible = false -anchor_left = 0.5 +anchor_left = 0.0 anchor_top = 0.0 -anchor_right = 0.5 +anchor_right = 1.0 anchor_bottom = 0.0 -margin_left = -766.0 -margin_top = 22.0 -margin_right = 767.0 -margin_bottom = 136.0 +margin_bottom = 160.0 +rect_min_size = Vector2( 0, 160 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +theme = ExtResource( 8 ) [node name="Label" type="Label" parent="Rewards/Panel"] anchor_left = 0.0 @@ -88,5 +86,5 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="Grasslands" parent="." instance=ExtResource( 8 )] +[node name="Grasslands" parent="." instance=ExtResource( 9 )] diff --git a/godot/interface/theme/slider/slider.stylebox b/godot/interface/theme/slider/slider.stylebox index 845882f184d477beb4b04c7ea214fdeacace53bf..358461f91981abcfcb534f3403e9c92205365009 100644 GIT binary patch literal 525 zcmV+o0`mP*Q$s@n000005C8ym1ONc_0RR9fwJ-f(bpu@w0OpiQJ5Xtq0DtDGDgg*R zE+HyG(xeBX?yOgkKLMGN2PBc?rzHKZ4b_=rKC2W4hyZrU5T)GO5&;(twzSO$GXOOJ zIRGA>j>^lv%r)hv75<;j*`ty(Wq4g}Hy^CiF|?n0+5X4;uXw*nAXEkL6m{o+gz>-e z2Ok-qb(X1}c%(e7$Yh~l9VN(FjjdN%%t+}2s4yR83@XSKUp64z>5-qgzCRNg1&bF%3xATOxKhuuqMiu7qAp7J$E ziG~8B)pj=nI33P^h6c0ABv3H@mI`GOA=zwyRVqEGNF)Z;XtV(0;o-2E96(TQn}KRV zh)}hJ2|vR^00)jngU#_@;eQ75Pz_nAflVNonJ{4i0c;px0+=IKG!nqWU=ASz4iZdV zg{{{A4aj`-PbGIjae>j)GCtl^UlSLkui$Qzk3@jlr>lsoR>uJpEm$8MV$fmtWrEq# zO8Zj=E2dz2ZkC(hN6+^W0v|z2r_i=hB*v6UC6^5=JVBAY!ip?}WrCFu$hIGhMGyfs z5FV`blrzh@u-zA1ZS*hNcz-?u&22#H_&|5!(y?l4GKQDZI&TbMqJoW5aKcv8WwrAm PQ_FX5cr@h?Qd2`iH6Z5} literal 493 zcmVj5{!Z<8WH&~05SkJ05e+DVXf!(1Ost`eScSKgNu>E#Vt*#ebXY_F#FIZ&i12Zk)tSN{)K zGgcR+Yq6)Bh*iYUUG+k-!0EEl%IJEbWTTMDxLXZH=xC!G5uT6de`C|pP*h<43T1+D zAnBAi7oQ9YAOxM#&zV1`TKpFXc*uA-FiMaA0RJ`9M_jEWb#0&vqYPW9!BHuZQBYVQ zuwh_=F-NR;5`e^9OeqBlMRg5X_J0F-KIzBU#7O~0<(-@pX7tq*Qz_X_hP zAHIu`IKD@lsjGh73H{&9m~E(pJRfVms~IdZikCkWGV#8!@ujHBDzs4)!I-#G$z?&y zw^G(upr@bkFusJd)A(?+idaCEutB4o>XO3sa?v8J(RxYOjBAE4@NF9n{k8Kw^*=qD jpdqg$%3cB5v>>xm1J5JWExON}w_3F7GM~G8Qd2`i(7Eq^ -- GitLab