mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
80 lines
2.5 KiB
Plaintext
80 lines
2.5 KiB
Plaintext
From 6ee1bb28686e898640e8dd25422667645c68b4e3 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
|
Date: Wed, 11 May 2022 04:32:47 +0100
|
|
Subject: patch out knsrcfiles
|
|
|
|
|
|
diff --git a/kasten/controllers/CMakeLists.txt b/kasten/controllers/CMakeLists.txt
|
|
index 332176a..13fe28a 100644
|
|
--- a/kasten/controllers/CMakeLists.txt
|
|
+++ b/kasten/controllers/CMakeLists.txt
|
|
@@ -661,7 +661,7 @@ target_include_directories(OktetaKastenControllers
|
|
${LIBFRAMESPRINT_REL_DIR}
|
|
)
|
|
|
|
-if(NOT KF5_VERSION VERSION_LESS "5.57.0")
|
|
+if(NOT KF5_VERSION VERSION_LESS "5.57.0" AND NOT HAIKU)
|
|
install(FILES view/structures/kns/okteta-structures.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
|
|
else()
|
|
install( FILES view/structures/kns/okteta-structures.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From 6d36ec689c0762d0ce5ee55b5fec18a609a6a942 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 17 May 2022 15:25:22 +1000
|
|
Subject: Workaround for mainWindow size bug
|
|
|
|
|
|
diff --git a/program/mainwindow.cpp b/program/mainwindow.cpp
|
|
index 7cc22dc..38a4ea9 100644
|
|
--- a/program/mainwindow.cpp
|
|
+++ b/program/mainwindow.cpp
|
|
@@ -102,6 +102,7 @@
|
|
// Qt
|
|
#include <QUrl>
|
|
#include <QMimeData>
|
|
+#include <QDesktopWidget>
|
|
|
|
namespace Kasten {
|
|
|
|
@@ -148,6 +149,11 @@ OktetaMainWindow::OktetaMainWindow(OktetaProgram* program)
|
|
// tmp
|
|
addXmlGuiControllerFromFactory(ToolListMenuControllerFactory(this));
|
|
addXmlGuiControllerFromFactory(ViewListMenuControllerFactory(viewManager(), viewArea()));
|
|
+ // Workaround for window height
|
|
+#ifdef Q_OS_HAIKU
|
|
+ setMaximumSize(QApplication::desktop()->screenGeometry().size() - QSize(0, 32));
|
|
+ showMaximized();
|
|
+#endif
|
|
}
|
|
|
|
OktetaMainWindow::~OktetaMainWindow() = default;
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From ccc9dceed0390e50037d901485775fe2708f4c1e Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 17 May 2022 15:25:52 +1000
|
|
Subject: Disable color scheme
|
|
|
|
|
|
diff --git a/libs/kasten/controllers/CMakeLists.txt b/libs/kasten/controllers/CMakeLists.txt
|
|
index 78fcb01..53d61ed 100644
|
|
--- a/libs/kasten/controllers/CMakeLists.txt
|
|
+++ b/libs/kasten/controllers/CMakeLists.txt
|
|
@@ -209,7 +209,7 @@ kastencontrollers_add_sublibrary(shellwindow/fullscreen
|
|
)
|
|
|
|
# KColorSchemeManager::createSchemeSelectionMenu misses to set UI string before 5.67
|
|
-if(NOT KF5_VERSION VERSION_LESS "5.67.0")
|
|
+if(NOT KF5_VERSION VERSION_LESS "5.67.0" AND NOT HAIKU)
|
|
set(HAVE_UICOLORSCHEMECONTROLLER TRUE)
|
|
kastencontrollers_add_sublibrary(program/uicolorscheme
|
|
PUBLIC
|
|
--
|
|
2.30.2
|
|
|