mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
Scribus: use system font
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From da8d77a216c8855827466a9bf9d0c77de9a5e4f2 Mon Sep 17 00:00:00 2001
|
||||
From 879e16368f70e15dbbfc77996788a6a59b286817 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 16 Nov 2020 21:51:24 +1000
|
||||
Subject: Fix build
|
||||
@@ -116,5 +116,65 @@ index 5adfab7..ebf0bdb 100644
|
||||
char **messages = ( char ** ) nullptr;
|
||||
int i, trace_size = 0;
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From e1abb27e77e98a0496980537bcb500d36642c521 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 8 Jan 2021 22:00:46 +1000
|
||||
Subject: Fix for app font
|
||||
|
||||
|
||||
diff --git a/scribus/main_nix.cpp b/scribus/main_nix.cpp
|
||||
index e50217e..a20ab3c 100644
|
||||
--- a/scribus/main_nix.cpp
|
||||
+++ b/scribus/main_nix.cpp
|
||||
@@ -64,8 +64,9 @@ int main(int argc, char *argv[])
|
||||
int mainApp(int argc, char **argv)
|
||||
{
|
||||
emergencyActivated = false;
|
||||
-
|
||||
+#ifndef Q_OS_HAIKU
|
||||
ScribusQApp::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
+#endif
|
||||
ScribusQApp app(argc, argv);
|
||||
initCrashHandler();
|
||||
app.parseCommandLine();
|
||||
diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp
|
||||
index 6c68349..176dd76 100644
|
||||
--- a/scribus/prefsmanager.cpp
|
||||
+++ b/scribus/prefsmanager.cpp
|
||||
@@ -2756,9 +2756,11 @@ bool PrefsManager::ReadPref(const QString& ho)
|
||||
// Eg : Windows XP and Windows Vista styles
|
||||
// qApp->setPalette(qApp->style()->standardPalette());
|
||||
}
|
||||
+#ifndef Q_OS_HAIKU
|
||||
QFont apf = qApp->font();
|
||||
apf.setPointSize(appPrefs.uiPrefs.applicationFontSize);
|
||||
qApp->setFont(apf);
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
|
||||
index 47ddead..7253da9 100644
|
||||
--- a/scribus/scribus.cpp
|
||||
+++ b/scribus/scribus.cpp
|
||||
@@ -6517,12 +6517,14 @@ void ScribusMainWindow::slotPrefsOrg()
|
||||
ScQApp->changeIconSet(newIconSet);
|
||||
|
||||
int newUIFontSize = m_prefsManager.guiFontSize();
|
||||
+#ifndef Q_OS_HAIKU
|
||||
if (oldPrefs.uiPrefs.applicationFontSize != newUIFontSize)
|
||||
{
|
||||
QFont apf = qApp->font();
|
||||
apf.setPointSize(newUIFontSize);
|
||||
qApp->setFont(apf);
|
||||
}
|
||||
+#endif
|
||||
emit UpdateRequest(reqDefFontListUpdate);
|
||||
if (m_prefsManager.appPrefs.uiPrefs.useTabs)
|
||||
{
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ versatile PDF creation."
|
||||
HOMEPAGE="https://www.scribus.net"
|
||||
COPYRIGHT="2014-2020 Scribus Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab"
|
||||
PATCHES="scribus-$portVersion.patchset"
|
||||
|
||||
Reference in New Issue
Block a user