Skip to content

Commit f9a852e

Browse files
Merge pull request #2 from ModeratePrawn/ModeratePrawn-patch-1
Minor Update
2 parents 8e253ea + 5434306 commit f9a852e

File tree

3 files changed

+40
-30
lines changed

3 files changed

+40
-30
lines changed

Main.tscn

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ script = ExtResource( 1 )
2323
[node name="GUI" type="CanvasLayer" parent="."]
2424
follow_viewport_enable = true
2525

26+
[node name="Panel" type="Panel" parent="GUI"]
27+
anchor_right = 1.0
28+
anchor_bottom = 1.0
29+
2630
[node name="Forecasts" type="MarginContainer" parent="GUI"]
2731
anchor_right = 1.0
2832
anchor_bottom = 1.0
@@ -35,7 +39,7 @@ custom_constants/margin_bottom = 10
3539
margin_left = 10.0
3640
margin_top = 60.0
3741
margin_right = 722.0
38-
margin_bottom = 1160.0
42+
margin_bottom = 1130.0
3943

4044
[node name="Header" type="VBoxContainer" parent="GUI/Forecasts/Window"]
4145
margin_right = 712.0
@@ -145,24 +149,22 @@ margin_bottom = 204.0
145149
[node name="HourlyScroll" type="ScrollContainer" parent="GUI/Forecasts/Window"]
146150
margin_top = 208.0
147151
margin_right = 712.0
148-
margin_bottom = 268.0
149-
rect_min_size = Vector2( 75, 60 )
150-
size_flags_horizontal = 3
151-
size_flags_vertical = 3
152+
margin_bottom = 238.0
153+
rect_min_size = Vector2( 0, 30 )
152154
scroll_vertical_enabled = false
153155

154156
[node name="HourlyCast" type="HBoxContainer" parent="GUI/Forecasts/Window/HourlyScroll"]
155157
alignment = 1
156158

157159
[node name="HSeparator3" type="HSeparator" parent="GUI/Forecasts/Window"]
158-
margin_top = 272.0
160+
margin_top = 242.0
159161
margin_right = 712.0
160-
margin_bottom = 276.0
162+
margin_bottom = 246.0
161163

162164
[node name="WeeklyScroll" type="ScrollContainer" parent="GUI/Forecasts/Window"]
163-
margin_top = 280.0
165+
margin_top = 250.0
164166
margin_right = 712.0
165-
margin_bottom = 1100.0
167+
margin_bottom = 1070.0
166168
rect_min_size = Vector2( 0, 820 )
167169
size_flags_horizontal = 3
168170
size_flags_vertical = 3

T0.tscn

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
[gd_scene format=2]
1+
[gd_scene load_steps=2 format=2]
2+
3+
[ext_resource path="res://new_dynamicfont.tres" type="DynamicFont" id=1]
24

35
[node name="T0" type="VBoxContainer"]
46
margin_right = 66.0
@@ -8,44 +10,50 @@ size_flags_vertical = 0
810
alignment = 1
911

1012
[node name="DateTime" type="Label" parent="."]
11-
margin_right = 66.0
12-
margin_bottom = 14.0
13+
margin_right = 104.0
14+
margin_bottom = 28.0
15+
custom_fonts/font = ExtResource( 1 )
1316
text = "DateTime"
1417
align = 1
1518

1619
[node name="T0Temp" type="HBoxContainer" parent="."]
17-
margin_top = 18.0
18-
margin_right = 66.0
19-
margin_bottom = 32.0
20+
margin_top = 32.0
21+
margin_right = 104.0
22+
margin_bottom = 60.0
2023
alignment = 1
2124

2225
[node name="Temp" type="Label" parent="T0Temp"]
23-
margin_left = 19.0
24-
margin_right = 35.0
25-
margin_bottom = 14.0
26+
margin_left = 29.0
27+
margin_right = 57.0
28+
margin_bottom = 28.0
29+
custom_fonts/font = ExtResource( 1 )
2630
text = "80"
2731
align = 1
2832

2933
[node name="Unit" type="Label" parent="T0Temp"]
30-
margin_left = 39.0
31-
margin_right = 46.0
32-
margin_bottom = 14.0
34+
margin_left = 61.0
35+
margin_right = 74.0
36+
margin_bottom = 28.0
37+
custom_fonts/font = ExtResource( 1 )
3338
text = "F"
3439
align = 1
3540

3641
[node name="T0Wind" type="HBoxContainer" parent="."]
37-
margin_top = 36.0
38-
margin_right = 66.0
39-
margin_bottom = 50.0
42+
margin_top = 64.0
43+
margin_right = 104.0
44+
margin_bottom = 92.0
4045
alignment = 1
4146

4247
[node name="WindSpeed" type="Label" parent="T0Wind"]
43-
margin_right = 49.0
44-
margin_bottom = 14.0
48+
margin_left = 1.0
49+
margin_right = 78.0
50+
margin_bottom = 28.0
51+
custom_fonts/font = ExtResource( 1 )
4552
text = "10 mph"
4653

4754
[node name="Direction" type="Label" parent="T0Wind"]
48-
margin_left = 53.0
49-
margin_right = 66.0
50-
margin_bottom = 14.0
55+
margin_left = 82.0
56+
margin_right = 103.0
57+
margin_bottom = 28.0
58+
custom_fonts/font = ExtResource( 1 )
5159
text = "W"

export_presets.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ custom_features=""
77
export_filter="all_resources"
88
include_filter=""
99
exclude_filter=""
10-
export_path="../../DevTools/Exports/Android/MiniWeather/MiniWeatherV0.1.6.apk"
10+
export_path="../../DevTools/Exports/Android/MiniWeather/MiniWeatherV0.2.apk"
1111
script_export_mode=1
1212
script_encryption_key=""
1313

0 commit comments

Comments
 (0)