diff --git a/bin/breezy_kwin_setup b/bin/breezy_kwin_setup index 8b77672..67a383f 100755 --- a/bin/breezy_kwin_setup +++ b/bin/breezy_kwin_setup @@ -118,17 +118,16 @@ then pkgkwin_stderr=$(LOCAL_BUILD_SYSTEM=1 bin/package_kwin --download-driver 2>&1) pkgkwin_rc=$? set -e - if echo "$pkgkwin_stderr" | grep -qi "could not find"; then - if [ -z "${PRINT_FULL_STDERR+x}" ]; then - print_missing_dependencies "$0" - exit 1 - else - echo "$pkgkwin_stderr" - fi - fi if [ "$pkgkwin_rc" -ne 0 ]; then - echo "$pkgkwin_stderr" - echo "Error: build failed with exit code $pkgkwin_rc" + if echo "$pkgkwin_stderr" | grep -qi "could not find"; then + if [ -z "${PRINT_FULL_STDERR+x}" ]; then + print_missing_dependencies "$0" + else + echo "$pkgkwin_stderr" + fi + fi + echo "" + echo "Error: Breezy Desktop build failed with exit code $pkgkwin_rc" exit $pkgkwin_rc fi FILE_NAME="breezyKWin-$ARCH.tar.gz" diff --git a/gnome/src/monitormanager.js b/gnome/src/monitormanager.js index 4c57171..4c02ce6 100644 --- a/gnome/src/monitormanager.js +++ b/gnome/src/monitormanager.js @@ -34,6 +34,7 @@ export const SUPPORTED_MONITOR_PRODUCTS = [ 'Air 2 Ultra', 'SmartGlasses', // TCL/RayNeo 'Rokid Max', + 'Rokid Max 2', 'Rokid Air', NESTED_MONITOR_PRODUCT ]; diff --git a/kwin/src/kcm/breezydesktopeffectkcm.cpp b/kwin/src/kcm/breezydesktopeffectkcm.cpp index bc81e1e..5135087 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.cpp +++ b/kwin/src/kcm/breezydesktopeffectkcm.cpp @@ -191,9 +191,9 @@ void BreezyDesktopEffectConfig::pollDriverState() const bool wasDeviceConnected = m_deviceConnected; m_deviceConnected = !m_connectedDeviceBrand.isEmpty() && !m_connectedDeviceModel.isEmpty(); - if (m_deviceConnected != wasDeviceConnected) { - ui.labelDeviceConnectionStatus->setText(m_deviceConnected ? - QStringLiteral("%1 %2 connected").arg(m_connectedDeviceBrand, m_connectedDeviceModel) : + if (ui.labelDeviceConnectionStatus->text().isEmpty() || m_deviceConnected != wasDeviceConnected) { + ui.labelDeviceConnectionStatus->setText(m_deviceConnected ? + QStringLiteral("%1 %2 connected").arg(m_connectedDeviceBrand, m_connectedDeviceModel) : QStringLiteral("No device connected")); } diff --git a/kwin/src/kcm/breezydesktopeffectkcm.ui b/kwin/src/kcm/breezydesktopeffectkcm.ui index a88600d..fbca9ed 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.ui +++ b/kwin/src/kcm/breezydesktopeffectkcm.ui @@ -2,14 +2,11 @@ BreezyDesktopEffectConfig - - 800 - - - - - - No device connected + + + + + Qt::AlignHCenter|Qt::AlignVCenter diff --git a/kwin/src/kcm/labeledslider.h b/kwin/src/kcm/labeledslider.h index 6a8a4ec..77a62e0 100644 --- a/kwin/src/kcm/labeledslider.h +++ b/kwin/src/kcm/labeledslider.h @@ -134,11 +134,13 @@ private: return QString::number(raw); } int divisor = 1; - for (int i = 0; i < m_decimalShift; ++i) divisor *= 10; // small loop, m_decimalShift capped + for (int i = 0; i < m_decimalShift; ++i) divisor *= 10; int whole = raw / divisor; int frac = std::abs(raw % divisor); QString fracStr = QString::number(frac).rightJustified(m_decimalShift, QLatin1Char('0')); - return QString::number(whole) + QLatin1Char('.') + fracStr; + QString result = QString::number(std::abs(whole)) + QLatin1Char('.') + fracStr; + if (raw < 0) result.prepend(QLatin1Char('-')); + return result; } bool m_showValueBubble = true; diff --git a/kwin/src/qml/main.qml b/kwin/src/qml/main.qml index 6b81a7e..6b9a615 100644 --- a/kwin/src/qml/main.qml +++ b/kwin/src/qml/main.qml @@ -17,6 +17,7 @@ Item { "Air 2 Ultra", "SmartGlasses", // TCL/RayNeo "Rokid Max", + "Rokid Max 2", "Rokid Air" ] required property QtObject effect