summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ui/sidebarwidget.c6
-rw-r--r--src/ui/sidebarwidget.h2
-rw-r--r--src/ui/window.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index ab3b11cf..12c5e847 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -325,7 +325,7 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
325 for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) { 325 for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) {
326 setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode); 326 setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode);
327 } 327 }
328 const float heights[max_SidebarMode] = { 2.333f, 1.333f, 1.333f, 3.5f, 1.2f }; 328 const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
329 setBackgroundColor_Widget(as_Widget(d->list), 329 setBackgroundColor_Widget(as_Widget(d->list),
330 d->mode == documentOutline_SidebarMode ? tmBannerBackground_ColorId 330 d->mode == documentOutline_SidebarMode ? tmBannerBackground_ColorId
331 : uiBackground_ColorId); 331 : uiBackground_ColorId);
@@ -344,16 +344,16 @@ int width_SidebarWidget(const iSidebarWidget *d) {
344} 344}
345 345
346static const char *normalModeLabels_[max_SidebarMode] = { 346static const char *normalModeLabels_[max_SidebarMode] = {
347 "\U00002605 Feeds",
348 "\U0001f588 Bookmarks", 347 "\U0001f588 Bookmarks",
348 "\U00002605 Feeds",
349 "\U0001f553 History", 349 "\U0001f553 History",
350 "\U0001f464 Identities", 350 "\U0001f464 Identities",
351 "\U0001f5b9 Outline", 351 "\U0001f5b9 Outline",
352}; 352};
353 353
354static const char *tightModeLabels_[max_SidebarMode] = { 354static const char *tightModeLabels_[max_SidebarMode] = {
355 "\U00002605",
356 "\U0001f588", 355 "\U0001f588",
356 "\U00002605",
357 "\U0001f553", 357 "\U0001f553",
358 "\U0001f464", 358 "\U0001f464",
359 "\U0001f5b9", 359 "\U0001f5b9",
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 001c8ac1..0d4ed9c8 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
25#include "widget.h" 25#include "widget.h"
26 26
27enum iSidebarMode { 27enum iSidebarMode {
28 feeds_SidebarMode,
29 bookmarks_SidebarMode, 28 bookmarks_SidebarMode,
29 feeds_SidebarMode,
30 history_SidebarMode, 30 history_SidebarMode,
31 identities_SidebarMode, 31 identities_SidebarMode,
32 documentOutline_SidebarMode, 32 documentOutline_SidebarMode,
diff --git a/src/ui/window.c b/src/ui/window.c
index ee90f12b..b31707fe 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -142,8 +142,8 @@ static const iMenuItem identityMenuItems[] = {
142}; 142};
143 143
144static const iMenuItem viewMenuItems[] = { 144static const iMenuItem viewMenuItems[] = {
145 { "Show Feeds", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" }, 145 { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" },
146 { "Show Bookmarks", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" }, 146 { "Show Feeds", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" },
147 { "Show History", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" }, 147 { "Show History", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
148 { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" }, 148 { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
149 { "Show Page Outline", '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1" }, 149 { "Show Page Outline", '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1" },
@@ -174,11 +174,11 @@ static const iMenuItem identityButtonMenuItems[] = {
174#if !defined (iHaveNativeMenus) 174#if !defined (iHaveNativeMenus)
175 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" }, 175 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
176 { "---", 0, 0, NULL }, 176 { "---", 0, 0, NULL },
177 { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 show:1" }, 177 { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
178#else 178#else
179 { "New Identity...", 0, 0, "ident.new" }, 179 { "New Identity...", 0, 0, "ident.new" },
180 { "---", 0, 0, NULL }, 180 { "---", 0, 0, NULL },
181 { "Show Identities", 0, 0, "sidebar.mode arg:2 show:1" }, 181 { "Show Identities", 0, 0, "sidebar.mode arg:3 show:1" },
182#endif 182#endif
183}; 183};
184 184