Fix SimplyWindow to have status_bar_insets_bottom only for round (Add…

…resses pebble#139)
84zume · Feb 14, 2016 · 5d8b9bd · 5d8b9bd
1 parent 6996a55
commit 5d8b9bd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/js/app.js b/src/js/app.js
@@ -28,6 +28,10 @@ main.on('click', 'up', function(e) {
       }, {
         title: 'Second Item',
         subtitle: 'Subtitle Text'
+      }, {
+        title: 'Third Item',
+      }, {
+        title: 'Fourth Item',
       }]
     }]
   });

diff --git a/src/simply/simply_menu.c b/src/simply/simply_menu.c
@@ -644,7 +644,9 @@ SimplyMenu *simply_menu_create(Simply *simply) {
   SimplyMenu *self = malloc(sizeof(*self));
   *self = (SimplyMenu) {
     .window.simply = simply,
+#if defined(PBL_ROUND)
     .window.status_bar_insets_bottom = true,
+#endif
     .menu_layer.num_sections = 1,
   };
 

diff --git a/src/simply/simply_window.c b/src/simply/simply_window.c
@@ -125,8 +125,10 @@ static void prv_update_layer_placement(SimplyWindow *self) {
     if (has_status_bar) {
       GRect status_frame = { .size = { frame.size.w, STATUS_BAR_LAYER_HEIGHT } };
       frame.origin.y = STATUS_BAR_LAYER_HEIGHT;
+#if defined(PBL_ROUND)
       frame.size.h -= self->status_bar_insets_bottom ? STATUS_BAR_LAYER_HEIGHT * 2 :
                                                        STATUS_BAR_LAYER_HEIGHT;
+#endif
       if (has_action_bar) {
         status_frame.size.w -= ACTION_BAR_WIDTH;
       }

diff --git a/src/simply/simply_window.h b/src/simply/simply_window.h
@@ -25,8 +25,10 @@ struct SimplyWindow {
   GColor8 background_color;
   bool is_scrollable:1;
   bool use_status_bar:1;
-  bool status_bar_insets_bottom:1;
   bool use_action_bar:1;
+#if defined(PBL_ROUND)
+  bool status_bar_insets_bottom:1;
+#endif
 };
 
 SimplyWindow *simply_window_init(SimplyWindow *self, Simply *simply);