From a35d9b469d4ed65fd992771aa98ac57241983794 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 12 Jun 2019 01:00:59 -0700
Subject: Refactor deinit check to reduce code size.

---
 shared-module/displayio/Display.h | 28 ++++++++++++++--------------
 shared-module/displayio/Group.h   |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'shared-module')

diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
index 687e412c2..fa8902ced 100644
--- a/shared-module/displayio/Display.h
+++ b/shared-module/displayio/Display.h
@@ -40,19 +40,8 @@ typedef void (*display_bus_end_transaction)(mp_obj_t bus);
 typedef struct {
     mp_obj_base_t base;
     mp_obj_t bus;
-    uint16_t width;
-    uint16_t height;
-    uint16_t color_depth;
-    uint8_t set_column_command;
-    uint8_t set_row_command;
-    uint8_t write_ram_command;
     displayio_group_t *current_group;
-    bool refresh;
     uint64_t last_refresh;
-    int16_t colstart;
-    int16_t rowstart;
-    bool single_byte_bounds;
-    bool data_as_commands;
     display_bus_begin_transaction begin_transaction;
     display_bus_send send;
     display_bus_end_transaction end_transaction;
@@ -61,11 +50,22 @@ typedef struct {
         pulseio_pwmout_obj_t backlight_pwm;
     };
     uint64_t last_backlight_refresh;
-    bool auto_brightness:1;
-    bool updating_backlight:1;
-    bool full_refresh; // New group means we need to refresh the whole display.
     displayio_buffer_transform_t transform;
     displayio_area_t area;
+    uint16_t width;
+    uint16_t height;
+    uint16_t color_depth;
+    int16_t colstart;
+    int16_t rowstart;
+    uint8_t set_column_command;
+    uint8_t set_row_command;
+    uint8_t write_ram_command;
+    bool refresh;
+    bool single_byte_bounds;
+    bool data_as_commands;
+    bool auto_brightness;
+    bool updating_backlight;
+    bool full_refresh; // New group means we need to refresh the whole display.
 } displayio_display_obj_t;
 
 void displayio_display_start_refresh(displayio_display_obj_t* self);
diff --git a/shared-module/displayio/Group.h b/shared-module/displayio/Group.h
index 1642b4602..7ce19a4cd 100644
--- a/shared-module/displayio/Group.h
+++ b/shared-module/displayio/Group.h
@@ -40,12 +40,12 @@ typedef struct {
 
 typedef struct {
     mp_obj_base_t base;
+    displayio_group_child_t* children;
     int16_t x;
     int16_t y;
     uint16_t scale;
     uint16_t size;
     uint16_t max_size;
-    displayio_group_child_t* children;
     bool item_removed;
     bool in_group;
     displayio_buffer_transform_t absolute_transform;
-- 
cgit v1.2.3