Skip to content

Commit

Permalink
Merge pull request #2 from ModeratePrawn/ModeratePrawn-patch-1
Browse files Browse the repository at this point in the history
Minor Update
  • Loading branch information
ModeratePrawn authored Jun 23, 2022
2 parents 8e253ea + 5434306 commit f9a852e
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 30 deletions.
20 changes: 11 additions & 9 deletions Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ script = ExtResource( 1 )
[node name="GUI" type="CanvasLayer" parent="."]
follow_viewport_enable = true

[node name="Panel" type="Panel" parent="GUI"]
anchor_right = 1.0
anchor_bottom = 1.0

[node name="Forecasts" type="MarginContainer" parent="GUI"]
anchor_right = 1.0
anchor_bottom = 1.0
Expand All @@ -35,7 +39,7 @@ custom_constants/margin_bottom = 10
margin_left = 10.0
margin_top = 60.0
margin_right = 722.0
margin_bottom = 1160.0
margin_bottom = 1130.0

[node name="Header" type="VBoxContainer" parent="GUI/Forecasts/Window"]
margin_right = 712.0
Expand Down Expand Up @@ -145,24 +149,22 @@ margin_bottom = 204.0
[node name="HourlyScroll" type="ScrollContainer" parent="GUI/Forecasts/Window"]
margin_top = 208.0
margin_right = 712.0
margin_bottom = 268.0
rect_min_size = Vector2( 75, 60 )
size_flags_horizontal = 3
size_flags_vertical = 3
margin_bottom = 238.0
rect_min_size = Vector2( 0, 30 )
scroll_vertical_enabled = false

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

[node name="HSeparator3" type="HSeparator" parent="GUI/Forecasts/Window"]
margin_top = 272.0
margin_top = 242.0
margin_right = 712.0
margin_bottom = 276.0
margin_bottom = 246.0

[node name="WeeklyScroll" type="ScrollContainer" parent="GUI/Forecasts/Window"]
margin_top = 280.0
margin_top = 250.0
margin_right = 712.0
margin_bottom = 1100.0
margin_bottom = 1070.0
rect_min_size = Vector2( 0, 820 )
size_flags_horizontal = 3
size_flags_vertical = 3
Expand Down
48 changes: 28 additions & 20 deletions T0.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[gd_scene format=2]
[gd_scene load_steps=2 format=2]

[ext_resource path="res://new_dynamicfont.tres" type="DynamicFont" id=1]

[node name="T0" type="VBoxContainer"]
margin_right = 66.0
Expand All @@ -8,44 +10,50 @@ size_flags_vertical = 0
alignment = 1

[node name="DateTime" type="Label" parent="."]
margin_right = 66.0
margin_bottom = 14.0
margin_right = 104.0
margin_bottom = 28.0
custom_fonts/font = ExtResource( 1 )
text = "DateTime"
align = 1

[node name="T0Temp" type="HBoxContainer" parent="."]
margin_top = 18.0
margin_right = 66.0
margin_bottom = 32.0
margin_top = 32.0
margin_right = 104.0
margin_bottom = 60.0
alignment = 1

[node name="Temp" type="Label" parent="T0Temp"]
margin_left = 19.0
margin_right = 35.0
margin_bottom = 14.0
margin_left = 29.0
margin_right = 57.0
margin_bottom = 28.0
custom_fonts/font = ExtResource( 1 )
text = "80"
align = 1

[node name="Unit" type="Label" parent="T0Temp"]
margin_left = 39.0
margin_right = 46.0
margin_bottom = 14.0
margin_left = 61.0
margin_right = 74.0
margin_bottom = 28.0
custom_fonts/font = ExtResource( 1 )
text = "F"
align = 1

[node name="T0Wind" type="HBoxContainer" parent="."]
margin_top = 36.0
margin_right = 66.0
margin_bottom = 50.0
margin_top = 64.0
margin_right = 104.0
margin_bottom = 92.0
alignment = 1

[node name="WindSpeed" type="Label" parent="T0Wind"]
margin_right = 49.0
margin_bottom = 14.0
margin_left = 1.0
margin_right = 78.0
margin_bottom = 28.0
custom_fonts/font = ExtResource( 1 )
text = "10 mph"

[node name="Direction" type="Label" parent="T0Wind"]
margin_left = 53.0
margin_right = 66.0
margin_bottom = 14.0
margin_left = 82.0
margin_right = 103.0
margin_bottom = 28.0
custom_fonts/font = ExtResource( 1 )
text = "W"
2 changes: 1 addition & 1 deletion export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../../DevTools/Exports/Android/MiniWeather/MiniWeatherV0.1.6.apk"
export_path="../../DevTools/Exports/Android/MiniWeather/MiniWeatherV0.2.apk"
script_export_mode=1
script_encryption_key=""

Expand Down

0 comments on commit f9a852e

Please sign in to comment.