From 7a0436a216555502b0a630f0ef854c2d5f767d84 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 4 Nov 2020 16:08:11 -0800
Subject: [PATCH] Manually make close tab buttons in macOS, because PySide2 is
 not showing the button on its own

---
 .../onionshare/resources/images/close_tab.png  | Bin 0 -> 688 bytes
 desktop/src/onionshare/tab_widget.py           |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 desktop/src/onionshare/resources/images/close_tab.png

diff --git a/desktop/src/onionshare/resources/images/close_tab.png b/desktop/src/onionshare/resources/images/close_tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7984a6d5f62671a8622df4802e2aa0efdb2f860
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTct%R4ptCx$WWauh)U_GRVYG*P%E_RU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1N_Y@Q_Y@9K-DZG
zlS&G?{HhRqMF>L(Ac45VOnpui)9@T$_we!cF2=LG&;2?2m4e9tpFljzbi*RvAdYWZ
zI_G`j2rEkp@j3B?K^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(jRh@*<CQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLX1|86cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#JiUHz}M1dS7h&V+;uH0<DH^e;?a+>jVfq16NwdUuy!1PtqG5
zEqVkDYy%h99ZlW?E_Z<8CtWfmM+(sN7mL9A8GTb87`z4g*4*CO`#607veZ@j1~@nb
z#!HmF?(yzWcW?imY4`U7%&&6GnQcfO00006VoOIv0QUg*0Q;G<dGi1O010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru<Omf5Iut8|s|5f60If+xK~xyib&tVq!cY)I->gYt
zE+K~?5h;=B!}h`cg@8zC!&T&vQjqve4l&4l!JKwSPrEZ3$I<*NOWL+=djJ@QVJ+z!
zSOI7O0%Y4wM4W6NuMqQ)fok3>NjuvtJb)aw-+}YOtV+msQ%%$KQ`hycq*oxgSGL{s
zeg72z5n-O|0-%)ATN%8(D(NF0K<ByOEwk-?6i}AbNZJ$yUsgr%&#vo^04XJw-~Iru
WzfOw|DSn;+0000<MNUMnLSTXykS2cs

literal 0
HcmV?d00001

diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py
index 2e85febf..84d16e83 100644
--- a/desktop/src/onionshare/tab_widget.py
+++ b/desktop/src/onionshare/tab_widget.py
@@ -156,6 +156,23 @@ class TabWidget(QtWidgets.QTabWidget):
         index = self.addTab(tab, strings._("gui_new_tab"))
         self.setCurrentIndex(index)
 
+        # In macOS, manually create a close button because tabs don't seem to have them otherwise
+        if self.common.platform == "Darwin":
+
+            def close_tab():
+                self.tabBar().tabCloseRequested.emit(self.indexOf(tab))
+
+            tab.close_button = QtWidgets.QPushButton()
+            tab.close_button.setFlat(True)
+            tab.close_button.setFixedWidth(40)
+            tab.close_button.setIcon(
+                QtGui.QIcon(GuiCommon.get_resource_path("images/close_tab.png"))
+            )
+            tab.close_button.clicked.connect(close_tab)
+            self.tabBar().setTabButton(
+                index, QtWidgets.QTabBar.RightSide, tab.close_button
+            )
+
         tab.init(mode_settings)
         # If it's persistent, set the persistent image in the tab
         self.change_persistent(tab.tab_id, tab.settings.get("persistent", "enabled"))