Fix small Preset

RingOV · Jul 12, 2019 · 3c85155 · 3c85155
1 parent a153742
commit 3c85155
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/gis-weather.py b/gis-weather.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 #  gis_weather.py
-v = '0.8.4'
+v = '0.8.4.1'
 #  Copyright (C) 2013-2019 Alexander Koltsov <ringov@mail.ru>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -204,7 +204,8 @@ def make_dirs(path):
     'day_left': 0,
     'day_top': 0,
     'height_adjustment': 0,
-    'width_fix': 0, #FIXME Not used
+    'height_fix': 0,
+    'width_fix': 0,
     'splash_icon_top': 0,
     'splash_version_top': 0,
     'block_wind_direct_small_left': 0,
@@ -1584,7 +1585,7 @@ def set_window_properties(self):
         if n < 1: n = 1
         # width = w_block*n + block_margin*2 + 10*(n - 1) + 2*margin + block_icons_left
         width = w_block*n + block_h_offset*n + 2*margin + block_icons_left + width_fix
-        height = 260 + block_margin + 2*margin + height_adjustment
+        height = 260 + block_margin + 2*margin + height_fix + height_adjustment
         self.window_main.resize(int(width*scale), int(height*scale))
         self.window_main.move(x_pos, y_pos)
         if sticky:

diff --git a/scripts/git_tag.sh b/scripts/git_tag.sh
@@ -2,4 +2,4 @@
 
 cd ..
 
-git tag -a v${1} -m 'version ${1}'; git push origin --tags
+git tag -a v${1} -m 'version '${1}; git push origin --tags
diff --git a/utils/presets.py b/utils/presets.py
@@ -217,12 +217,12 @@
         #  Compact day+wind
     {   'bg_left': 0,
         'bg_top': 0,
-        'bg_height': 145,
+        #'bg_height': 145,
         'block_now_left': -125,
         'block_icons_left': 49,
-        'block_icons_top': 30,
+        'block_icons_top': 20,
         'day_top': -75,
-        'height_fix': -180,
+        'height_fix': -170,
         'width_fix': 20,
         'n': 3,
         'show_block_wind_direct': False,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		cd ..

		git tag -a v${1} -m 'version ${1}'; git push origin --tags
		git tag -a v${1} -m 'version '${1}; git push origin --tags