From 3a3e1f7884b927132c58e2f8b133f1094837fd1d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 20 Nov 2022 21:35:29 +1000
Subject: [PATCH] Ghostwriter: fix crash on start

---
 app-text/ghostwriter/ghostwriter-1.7.4.recipe |  2 +-
 .../patches/ghostwriter-1.7.4.patchset        | 61 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/app-text/ghostwriter/ghostwriter-1.7.4.recipe b/app-text/ghostwriter/ghostwriter-1.7.4.recipe
index 9930bbf1c..45caec876 100644
--- a/app-text/ghostwriter/ghostwriter-1.7.4.recipe
+++ b/app-text/ghostwriter/ghostwriter-1.7.4.recipe
@@ -16,7 +16,7 @@ Main features:
 HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
 COPYRIGHT="wereturtle et al."
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/wereturtle/ghostwriter/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4987126e71a37556e575fbce2002c5504cf15a04c11bcce604a278f59ec9c11a"
 SOURCE_FILENAME="ghostwriter-$portVersion.tar.gz"
diff --git a/app-text/ghostwriter/patches/ghostwriter-1.7.4.patchset b/app-text/ghostwriter/patches/ghostwriter-1.7.4.patchset
index 9fcdbebe0..547e7297d 100644
--- a/app-text/ghostwriter/patches/ghostwriter-1.7.4.patchset
+++ b/app-text/ghostwriter/patches/ghostwriter-1.7.4.patchset
@@ -1,4 +1,4 @@
-From a999c99cb9adb59674558baa678f674fc7508632 Mon Sep 17 00:00:00 2001
+From b5875e11ba406751e0bf0a8877e878dc801f84f3 Mon Sep 17 00:00:00 2001
 From: Humdinger <humdingerb@gmail.com>
 Date: Sat, 22 Jan 2022 11:08:01 +0100
 Subject: Include QPainterPath header to fix build
@@ -17,5 +17,62 @@ index 128cf52..65f9624 100644
  #include <QPixmap>
  #include <QPainter>
 -- 
-2.30.2
+2.37.3
+
+
+From b6470ed0038ba75cd71232fee0f98f35dcbd66cb Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 20 Nov 2022 21:31:59 +1000
+Subject: Disable sizeGrip
+
+
+diff --git a/src/HudWindow.cpp b/src/HudWindow.cpp
+index 4f8d1c9..f5f1b39 100644
+--- a/src/HudWindow.cpp
++++ b/src/HudWindow.cpp
+@@ -149,8 +149,9 @@ HudWindow::HudWindow(QWidget *parent)
+     {
+         sizeGripAlignment = Qt::AlignLeft;
+     }
+-
++#ifndef Q_OS_HAIKU
+     layout->addWidget(sizeGripContainer, 2, 0, 1, 1, sizeGripAlignment);
++#endif
+     layout->setRowStretch(0, 0);
+     layout->setRowStretch(1, 1);
+     layout->setRowStretch(2, 0);
+-- 
+2.37.3
+
+
+From 4afe5d9268dc174e5b2386f6c56720cba748d9fc Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 20 Nov 2022 21:32:25 +1000
+Subject: Don't apply style for MenuBar
+
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index e2dd0e4..79c9e47 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -2171,7 +2171,7 @@ void MainWindow::applyTheme()
+         originalBackgroundImage.load(theme.getBackgroundImageUrl());
+         predrawBackgroundImage();
+     }
+-
++#ifndef Q_OS_HAIKU
+     stream
+         << "#editorLayoutArea { background-color: transparent; border: 0; margin: 0 }"
+         << "QMenuBar { background: transparent } "
+@@ -2187,7 +2187,7 @@ void MainWindow::applyTheme()
+         << "; border-radius: 3px"
+         << " } "
+         ;
+-
++#endif
+     // Do not call this->setStyleSheet().  Calling it more than once in a run
+     // (i.e., when changing a theme) causes a crash in Qt 5.11.  Instead,
+     // change the main window's style sheet via qApp.
+-- 
+2.37.3