From edf90a8d167aed82aadf93d59b0482b127b1e043 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Wed, 8 Oct 2025 20:31:34 +0100 Subject: [PATCH 1/3] Do not fall back on XCURSOR_{THEME,SIZE) env vars ...if not set in environment file --- src/settings.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index b94f058..256561d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -8,15 +8,6 @@ extern "C" { #include "xml.h" } -#define DEFAULT_XCURSOR_SIZE 24 -int xcursor_size(void) -{ - bool success = false; - int size = QString(qgetenv("XCURSOR_SIZE")).toInt(&success); - return success ? size : DEFAULT_XCURSOR_SIZE; -} -#undef DEFAULT_XCURSOR_SIZE - void initSettings(std::vector> &settings) { // Appearance @@ -36,11 +27,10 @@ void initSettings(std::vector> &settings) // Mouse & Touchpad settings.push_back(std::make_shared("XCURSOR_THEME", LAB_FILE_TYPE_ENVIRONMENT, - LAB_VALUE_TYPE_STRING, - getenv("XCURSOR_THEME") ?: (char *)"Adwaita")); + LAB_VALUE_TYPE_STRING, "")); settings.push_back(std::make_shared("XCURSOR_SIZE", LAB_FILE_TYPE_ENVIRONMENT, - LAB_VALUE_TYPE_INT, xcursor_size())); + LAB_VALUE_TYPE_INT, 24)); settings.push_back(std::make_shared("/labwc_config/libinput/device/naturalScroll", LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0)); From d8a758ea671f30c667bf0c349113b602130500d8 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Wed, 8 Oct 2025 20:32:26 +0100 Subject: [PATCH 2/3] findIconThemes(): add empty entry ...so that user can choose to not set a theme. --- src/maindialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/maindialog.cpp b/src/maindialog.cpp index 4be2158..ca7d323 100644 --- a/src/maindialog.cpp +++ b/src/maindialog.cpp @@ -310,6 +310,7 @@ QStringList MainDialog::findIconThemes(enum lab_icon_theme_type type) // Iterate over paths and use any icon-theme which has more than just a // "cursors" subdirectory (because that means it's for cursors only) QStringList themes; + themes.push_front(""); themes.push_front("Adwaita"); for (const QString &path : std::as_const(paths)) { QDir dir(path); From c07f82ed0b4096d4dabeeafa25013582d6cd3bf8 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Wed, 8 Oct 2025 20:39:46 +0100 Subject: [PATCH 3/3] Update README --- README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df440c7..77a2865 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,23 @@ -# labwc-tweaks - [![CI]](https://github.com/labwc/labwc-tweaks/actions/workflows/build.yml) +
+
+

labwc-tweaks

+ +

+ A GUI settings application for labwc +

+
-This is a GUI 'Settings' application for labwc. +# About the Project +### Description + +1. GUI for managing settings in `~/.config/labwc{rc.xml,environment}` + +# Getting Started + ### dependencies Runtime: