aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-11-22 11:42:30 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-11-22 11:42:30 +0100
commit830c1b67a4391bed3c959faef9bff33aca5f5423 (patch)
tree961378f6f724bb34490afc37dd6a70834d33af06
parentAdd AboutPlugin dialog (diff)
downloadsmolbote-830c1b67a4391bed3c959faef9bff33aca5f5423.tar.xz
Fix transparent background being enabled if Plasma is found
-rw-r--r--linux/makepkg/PKGBUILD7
-rw-r--r--src/mainwindow/mainwindow.cpp5
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index fc3d16d..9a45114 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -36,7 +36,11 @@ prepare() {
pkgver() {
cd smolbote
+ # Without version tag
echo r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD) | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+
+ # With version tag
+ #git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
@@ -52,6 +56,9 @@ build() {
# --auto-features=disabled - features should be explicitly enabled
meson --buildtype=plain --prefix=/usr/local --auto-features=disabled $srcdir/build
+ # Run menuconfig
+ #KCONFIG_CONFIG=linux/.config menuconfig
+
cd $srcdir/build
# Toggle features
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index cb7fee6..e465a4f 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -37,7 +37,8 @@
#include "configuration.h"
#include "profilemanager.h"
#include "webprofile.h"
-#ifdef PLASMA
+#include "config.h"
+#ifdef CONFIG_PLASMA_BLUR
#include <KWindowEffects>
#endif
@@ -76,7 +77,7 @@ MainWindow::MainWindow(const std::unique_ptr<Configuration> &config, QWidget *pa
ui->setupUi(this);
-#ifdef PLASMA
+#ifdef CONFIG_PLASMA_BLUR
setAttribute(Qt::WA_TranslucentBackground, true);
KWindowEffects::enableBlurBehind(this->winId(), true);
#endif