From f3eb208c6aae253b8f686706a023ab3c73b7f748 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Tue, 15 Oct 2019 10:42:08 +0200
Subject: [PATCH] fix: refactored papirus layout

---
 pwnagotchi/ui/layout.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pwnagotchi/ui/layout.py b/pwnagotchi/ui/layout.py
index a7601e1..69dca81 100644
--- a/pwnagotchi/ui/layout.py
+++ b/pwnagotchi/ui/layout.py
@@ -29,22 +29,21 @@ def papirus(config, layout):
 
     layout['width'] = 200
     layout['height'] = 96
-    layout['face'] = (0, int(layout['height'] / 4))
-    layout['name'] = (5, int(layout['height'] * .15))
+    layout['face'] = (0, 24)
+    layout['name'] = (5, 14)
     layout['channel'] = (0, 0)
     layout['aps'] = (25, 0)
-    layout['uptime'] = (layout['width'] - 65, 0)
-    layout['line1'] = [0, int(layout['height'] * .12), layout['width'], int(layout['height'] * .12)]
-    layout['line2'] = [0, layout['height'] - int(layout['height'] * .12), layout['width'],
-                       layout['height'] - int(layout['height'] * .12)]
-    layout['friend_face'] = (0, (layout['height'] * 0.88) - 15)
-    layout['friend_name'] = (40, (layout['height'] * 0.88) - 13)
-    layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1)
-    layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1)
+    layout['uptime'] = (135, 0)
+    layout['line1'] = [0, 11, 200, 11]
+    layout['line2'] = [0, 85, 200, 85]
+    layout['friend_face'] = (0, 69)
+    layout['friend_name'] = (40, 71)
+    layout['shakes'] = (0, 86)
+    layout['mode'] = (175, 86)
     layout['status'] = {
-        'pos': (85, int(layout['height'] * .15)),
+        'pos': (85, 14),
         'font': fonts.Medium,
-        'max': (layout['width'] - 100) // 6
+        'max': 16
     }
     return layout