SidebarWidget: Save feeds mode (all/unread)

3 files changed, 17 insertions, 4 deletions

diff --git a/src/app.c b/src/app.c
index 9a292ea5..5e7af85e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -491,7 +491,13 @@ static iBool loadState_App_(iApp *d) {
                     setClosedFolders_SidebarWidget(sidebar, closedFolders[0]);
                     setClosedFolders_SidebarWidget(sidebar2, closedFolders[1]);
                     postCommandf_Root(root, "sidebar.mode arg:%u", modes & 0xf);
-                    postCommandf_Root(root, "sidebar2.mode arg:%u", modes >> 4);
+                    postCommandf_Root(root, "sidebar2.mode arg:%u", (modes >> 4) & 0xf);
+                    if (flags & 4) {
+                        postCommand_Widget(sidebar, "feeds.mode arg:%d", unread_FeedsMode);
+                    }
+                    if (flags & 8) {
+                        postCommand_Widget(sidebar2, "feeds.mode arg:%d", unread_FeedsMode);
+                    }
                     if (deviceType_App() != phone_AppDeviceType) {
                         setWidth_SidebarWidget(sidebar,  widths[0]);
                         setWidth_SidebarWidget(sidebar2, widths[1]);
@@ -566,7 +572,9 @@ static void saveState_App_(const iApp *d) {
                     const iSidebarWidget *sidebar2 = findChild_Widget(root->widget, "sidebar2");
                     writeU16_File(f, i |
                                   (isVisible_Widget(sidebar)  ? 0x100 : 0) |
-                                  (isVisible_Widget(sidebar2) ? 0x200 : 0));
+                                  (isVisible_Widget(sidebar2) ? 0x200 : 0) |
+                                  (feedsMode_SidebarWidget(sidebar)  == unread_FeedsMode ? 0x400 : 0) |
+                                  (feedsMode_SidebarWidget(sidebar2) == unread_FeedsMode ? 0x800 : 0));
                     writeU8_File(f,
                                  mode_SidebarWidget(sidebar) |
                                  (mode_SidebarWidget(sidebar2) << 4));
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6397528e..7982841d 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -360,11 +360,11 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                     iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
                 setFixedSize_Widget(
                     dropButton,
-                    init_I2(measure_Text(
+                    init_I2(iMaxi(20 * gap_UI, measure_Text(
                                 default_FontId,
                                 translateCStr_Lang(items[findWidestLabel_MenuItem(items, 2)].label))
                                     .advance.x +
-                                6 * gap_UI,
+                                                   6 * gap_UI),
                             -1));
             }
             d->menu = makeMenu_Widget(
@@ -691,6 +691,10 @@ enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
     return d ? d->mode : 0;
 }
 
+enum iFeedsMode feedsMode_SidebarWidget(const iSidebarWidget *d) {
+    return d ? d->feedsMode : 0;
+}
+
 float width_SidebarWidget(const iSidebarWidget *d) {
     return d ? d->widthAsGaps : 0;
 }
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 638a1f2f..81c6681f 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -56,5 +56,6 @@ iBool               setButtonFont_SidebarWidget (iSidebarWidget *, int font);
 void                setClosedFolders_SidebarWidget  (iSidebarWidget *, const iIntSet *closedFolders);
 
 enum iSidebarMode   mode_SidebarWidget          (const iSidebarWidget *);
+enum iFeedsMode     feedsMode_SidebarWidget     (const iSidebarWidget *);
 float               width_SidebarWidget         (const iSidebarWidget *);
 const iIntSet *     closedFolders_SidebarWidget (const iSidebarWidget *);