diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 4acb54ba464a50d020559127a11969f681c1a8f1..9b52d552316f70fa66a96c2aa7b12e082a4ebd0e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -14,3 +14,4 @@ install(TARGETS kwin5_update_default_rules DESTINATION ${KDE_INSTALL_LIBDIR}/kco install(FILES org_kde_kwin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) install(FILES kwinrc DESTINATION /etc/xdg) install(FILES kwin.desktop DESTINATION /etc/xdg/autostart) +install(FILES kwinrulesrc DESTINATION /etc/xdg) diff --git a/data/kwinrulesrc b/data/kwinrulesrc new file mode 100644 index 0000000000000000000000000000000000000000..2d940d4744800527fa8d029c6d5cab4ccc378779 --- /dev/null +++ b/data/kwinrulesrc @@ -0,0 +1,10 @@ +[1] +Description=disable_screensaver_shortcuts +disableglobalshortcuts=true +disableglobalshortcutsrule=2 +wmclass=ukui-screensaver-dialog +wmclasscomplete=false +wmclassmatch=1 + +[General] +count=1 diff --git a/debian/kwin-data.install b/debian/kwin-data.install index 726a8cfd14f0f7475aa0fa45447d7d6f6afdeb97..de37c67d27437f3e32aeba620224804dadc97693 100644 --- a/debian/kwin-data.install +++ b/debian/kwin-data.install @@ -32,3 +32,4 @@ usr/share/locale/ usr/share/qlogging-categories5/ etc/xdg/kwinrc etc/xdg/autostart/kwin.desktop +etc/xdg/kwinrulesrc diff --git a/src/effects/scale/package/contents/code/main.js b/src/effects/scale/package/contents/code/main.js index eb97629b0e1ea7ee98c757e5be8eb26f4bb81b3d..cdd557fc957e1395d16633c2d54ee7708a95a30f 100644 --- a/src/effects/scale/package/contents/code/main.js +++ b/src/effects/scale/package/contents/code/main.js @@ -93,6 +93,9 @@ class ScaleEffect { if (!ScaleEffect.isScaleWindow(window)) { return; } + if (window.caption == "ukui-session-tools") + return; + if (!window.visible) { return; }