summaryrefslogtreecommitdiff
path: root/src/ui/root.c
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-06-12 20:01:32 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-06-12 20:01:32 +0300
commitd5b8ef63d8c969b8e21129793534161bfb8e9fc0 (patch)
tree23490b3a41a254df76da1022075f53b8d53c2a40 /src/ui/root.c
parenta1fdf46087de8e1719ec80ac1ca145dacfc8e640 (diff)
Cleanup
Diffstat (limited to 'src/ui/root.c')
-rw-r--r--src/ui/root.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ui/root.c b/src/ui/root.c
index 0ab969bf..76f4c0d7 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -52,10 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
52 52
53#include <SDL_timer.h> 53#include <SDL_timer.h>
54 54
55#if defined (iPlatformAppleDesktop)
56# define iHaveNativeMenus
57#endif
58
59#if defined (iPlatformPcDesktop) 55#if defined (iPlatformPcDesktop)
60/* TODO: Submenus wouldn't hurt here. */ 56/* TODO: Submenus wouldn't hurt here. */
61static const iMenuItem navMenuItems_[] = { 57static const iMenuItem navMenuItems_[] = {
@@ -1158,11 +1154,11 @@ void createUserInterface_Root(iRoot *d) {
1158#if !defined (iHaveNativeMenus) 1154#if !defined (iHaveNativeMenus)
1159# if defined (iPlatformAppleMobile) 1155# if defined (iPlatformAppleMobile)
1160 iLabelWidget *navMenu = 1156 iLabelWidget *navMenu =
1161 makeMenuButton_LabelWidget("\U0001d362", isPhone ? phoneNavMenuItems_ : tabletNavMenuItems_, 1157 makeMenuButton_LabelWidget(menu_Icon, isPhone ? phoneNavMenuItems_ : tabletNavMenuItems_,
1162 isPhone ? iElemCount(phoneNavMenuItems_) : iElemCount(tabletNavMenuItems_)); 1158 isPhone ? iElemCount(phoneNavMenuItems_) : iElemCount(tabletNavMenuItems_));
1163# else 1159# else
1164 iLabelWidget *navMenu = 1160 iLabelWidget *navMenu =
1165 makeMenuButton_LabelWidget("\U0001d362", navMenuItems_, iElemCount(navMenuItems_)); 1161 makeMenuButton_LabelWidget(menu_Icon, navMenuItems_, iElemCount(navMenuItems_));
1166# endif 1162# endif
1167 setAlignVisually_LabelWidget(navMenu, iTrue); 1163 setAlignVisually_LabelWidget(navMenu, iTrue);
1168 setId_Widget(addChildFlags_Widget(navBar, iClob(navMenu), collapse_WidgetFlag), "navbar.menu"); 1164 setId_Widget(addChildFlags_Widget(navBar, iClob(navMenu), collapse_WidgetFlag), "navbar.menu");
@@ -1267,7 +1263,7 @@ void createUserInterface_Root(iRoot *d) {
1267 iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")), 1263 iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
1268 frameless_WidgetFlag | commandOnClick_WidgetFlag), 1264 frameless_WidgetFlag | commandOnClick_WidgetFlag),
1269 "toolbar.view"); 1265 "toolbar.view");
1270 iLabelWidget *menuButton = makeMenuButton_LabelWidget("\U0001d362", phoneNavMenuItems_, 1266 iLabelWidget *menuButton = makeMenuButton_LabelWidget(menu_Icon, phoneNavMenuItems_,
1271 iElemCount(phoneNavMenuItems_)); 1267 iElemCount(phoneNavMenuItems_));
1272 setFont_LabelWidget(menuButton, uiLabelLarge_FontId); 1268 setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
1273 setId_Widget(as_Widget(menuButton), "toolbar.navmenu"); 1269 setId_Widget(as_Widget(menuButton), "toolbar.navmenu");