7 files changed, 61 insertions, 4 deletions

diff --git a/src/app.c b/src/app.c
index fa7311c6..3a1fde85 100644
--- a/src/app.c
+++ b/src/app.c
@@ -406,6 +406,23 @@ iBool handleCommand_App(const char *cmd) {
         refresh_Widget(tabs);
         return iTrue;
     }
+    else if (equal_Command(cmd, "tabs.close")) {
+        iWidget *tabs = findWidget_App("doctabs");
+        if (tabCount_Widget(tabs) > 1) {
+            size_t index = tabPageIndex_Widget(tabs, document_App());
+            iWidget *closed = removeTabPage_Widget(tabs, index);
+            destroy_Widget(closed); /* released later */
+            if (index == tabCount_Widget(tabs)) {
+                index--;
+            }
+            arrange_Widget(tabs);
+            postCommandf_App("tabs.switch page:%p", tabPage_Widget(tabs, index));
+        }
+        else {
+            postCommand_App("quit");
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "quit")) {
         SDL_Event ev;
         ev.type = SDL_QUIT;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a789a759..53eb06bd 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -145,6 +145,9 @@ void init_DocumentWidget(iDocumentWidget *d) {
                                        { "Copy", 'c', KMOD_PRIMARY, "copy" },
                                        { "Copy Link", 0, 0, "document.copylink" } },
                         6);
+#if !defined (iPlatformApple) /* in system menu */
+    addAction_Widget(w, SDLK_w, KMOD_PRIMARY, "tabs.close");
+#endif
 }
 
 void deinit_DocumentWidget(iDocumentWidget *d) {
diff --git a/src/ui/macos.m b/src/ui/macos.m
index bf5c2f84..dcae94e6 100644
--- a/src/ui/macos.m
+++ b/src/ui/macos.m
@@ -180,6 +180,10 @@ enum iTouchBarVariant {
     postCommand_App("preferences");
 }
 
+- (void)closeTab {
+    postCommand_App("tabs.close");
+}
+
 - (void)postMenuItemCommand:(id)sender {
     NSString *command = [menuCommands objectForKey:[(NSMenuItem *)sender title]];
     if (command) {
@@ -347,6 +351,11 @@ void setupApplication_MacOS(void) {
     NSMenuItem *prefsItem = [appMenu itemWithTitle:@"Preferences…"];
     prefsItem.target = myDel;
     prefsItem.action = @selector(showPreferences);
+    /* Get rid of the default window close item */
+    NSMenu *windowMenu = [[[NSApp mainMenu] itemWithTitle:@"Window"] submenu];
+    NSMenuItem *windowCloseItem = [windowMenu itemWithTitle:@"Close"];
+    windowCloseItem.target = myDel;
+    windowCloseItem.action = @selector(closeTab);
 }
 
 void insertMenuItems_MacOS(const char *menuLabel, const iMenuItem *items, size_t count) {
diff --git a/src/ui/util.c b/src/ui/util.c
index b0bef69e..40debd28 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -295,7 +295,11 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
 iWidget *makeTabs_Widget(iWidget *parent) {
     iWidget *tabs = makeVDiv_Widget();
     iWidget *buttons = addChild_Widget(tabs, iClob(new_Widget()));
-    setFlags_Widget(buttons, arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag, iTrue);
+    buttons->rect.size.y = 2 * gap_UI + lineHeight_Text(default_FontId);
+    setFlags_Widget(buttons,
+                    resizeChildren_WidgetFlag | arrangeHorizontal_WidgetFlag |
+                        fixedHeight_WidgetFlag,
+                    iTrue);
     setId_Widget(buttons, "tabs.buttons");
     iWidget *pages = addChildFlags_Widget(
         tabs, iClob(new_Widget()), expand_WidgetFlag | resizeChildren_WidgetFlag);
@@ -313,7 +317,7 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
         findChild_Widget(tabs, "tabs.buttons"),
         iClob(new_LabelWidget(label, key, kmods, format_CStr("tabs.switch page:%p", page))),
         addPos);
-    setFlags_Widget(button, selected_WidgetFlag, isSel);
+    setFlags_Widget(button, selected_WidgetFlag | expand_WidgetFlag, isSel);
     addChildPos_Widget(pages, page, addPos);
     setFlags_Widget(page, hidden_WidgetFlag | disabled_WidgetFlag, !isSel);
 }
@@ -385,6 +389,11 @@ void setTabPageLabel_Widget(iWidget *tabs, const iAnyObject *page, const iString
     arrange_Widget(tabs);
 }
 
+size_t tabPageIndex_Widget(const iWidget *tabs, const iAnyObject *page) {
+    iWidget *pages = findChild_Widget(tabs, "tabs.pages");
+    return childIndex_Widget(pages, page);
+}
+
 const iWidget *currentTabPage_Widget(const iWidget *tabs) {
     iWidget *pages = findChild_Widget(tabs, "tabs.pages");
     iConstForEach(ObjectList, i, pages->children) {
@@ -396,7 +405,7 @@ const iWidget *currentTabPage_Widget(const iWidget *tabs) {
 }
 
 size_t tabCount_Widget(const iWidget *tabs) {
-    return childCount_Widget(findChild_Widget(tabs, "tabs.buttons"));
+    return childCount_Widget(findChild_Widget(tabs, "tabs.pages"));
 }
 
 /*-----------------------------------------------------------------------------------------------*/
diff --git a/src/ui/util.h b/src/ui/util.h
index 1f35b8e8..6eeea11d 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -101,6 +101,7 @@ iWidget *   tabPage_Widget          (iWidget *tabs, size_t index);
 iWidget *   removeTabPage_Widget    (iWidget *tabs, size_t index); /* returns the page */
 void        showTabPage_Widget      (iWidget *tabs, const iWidget *page);
 void        setTabPageLabel_Widget  (iWidget *tabs, const iAnyObject *page, const iString *label);
+size_t      tabPageIndex_Widget     (const iWidget *tabs, const iAnyObject *page);
 const iWidget *currentTabPage_Widget(const iWidget *tabs);
 size_t      tabCount_Widget         (const iWidget *tabs);
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 0db8b8fd..56b05aa6 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -33,7 +33,12 @@ void destroyPending_Widget(void) {
     iForEach(PtrSet, i, rootData_.pendingDestruction) {
         iWidget *widget = *i.value;
         remove_PtrSet(onTop_RootData_(), widget);
-        iRelease(removeChild_Widget(widget->parent, widget));
+        if (widget->parent) {
+            iRelease(removeChild_Widget(widget->parent, widget));
+        }
+        else {
+            iRelease(widget);
+        }
         remove_PtrSetIterator(&i);
     }
 }
@@ -481,6 +486,7 @@ iAny *addChildFlags_Widget(iWidget *d, iAnyObject *child, int childFlags) {
 }
 
 iAny *removeChild_Widget(iWidget *d, iAnyObject *child) {
+    iAssert(child);
     ref_Object(child);
     iBool found = iFalse;
     iForEach(ObjectList, i, d->children) {
@@ -505,6 +511,17 @@ iAny *child_Widget(iWidget *d, size_t index) {
     return NULL;
 }
 
+size_t childIndex_Widget(const iWidget *d, const iAnyObject *child) {
+    size_t index = 0;
+    iConstForEach(ObjectList, i, d->children) {
+        if (i.object == child) {
+            return index;
+        }
+        index++;
+    }
+    return iInvalidPos;
+}
+
 iAny *findChild_Widget(const iWidget *d, const char *id) {
     if (cmp_String(id_Widget(d), id) == 0) {
         return iConstCast(iAny *, d);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 0aff6505..8277b4ba 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -128,6 +128,7 @@ iAny *  addChildPos_Widget  (iWidget *, iAnyObject *child, enum iWidgetAddPos ad
 iAny *  addChildFlags_Widget(iWidget *, iAnyObject *child, int childFlags); /* holds a ref */
 iAny *  removeChild_Widget  (iWidget *, iAnyObject *child); /* returns a ref */
 iAny *  child_Widget        (iWidget *, size_t index); /* O(n) */
+size_t  childIndex_Widget   (const iWidget *, const iAnyObject *child); /* O(n) */
 void    arrange_Widget      (iWidget *);
 iBool   dispatchEvent_Widget(iWidget *, const SDL_Event *);
 iBool   processEvent_Widget (iWidget *, const SDL_Event *);