From 9a026b2484edb8d6bf2338f23f492093c034714e Mon Sep 17 00:00:00 2001 From: zach Date: Thu, 28 May 2026 20:21:22 +0200 Subject: [PATCH] respect new arguments --- Config/Config.qml | 9 ++-- Config/Screenshot.qml | 9 ++-- Modules/Settings/Categories/Screenshot.qml | 56 +++++++++++----------- scripts/SettingsIndex.mjs | 18 +++---- 4 files changed, 45 insertions(+), 47 deletions(-) diff --git a/Config/Config.qml b/Config/Config.qml index e1a6d6d..272e6b2 100644 --- a/Config/Config.qml +++ b/Config/Config.qml @@ -300,11 +300,10 @@ Singleton { return { enable_pp: screenshot.enable_pp, mode: screenshot.mode, - corner_radius: screenshot.corner_radius, - drop_shadow: screenshot.drop_shadow, - rounded_corners: screenshot.rounded_corners, - shadow_blur_radius: screenshot.shadow_blur_radius, - shadow_blur_passes: screenshot.shadow_blur_passes, + radius: screenshot.radius, + shadow: screenshot.shadow, + rounding: screenshot.rounding, + shadow_blur: screenshot.shadow_blur, shadow_color: screenshot.shadow_color, shadow_offset_x: screenshot.shadow_offset_x, shadow_offset_y: screenshot.shadow_offset_y diff --git a/Config/Screenshot.qml b/Config/Screenshot.qml index e250ffc..cd6dd49 100644 --- a/Config/Screenshot.qml +++ b/Config/Screenshot.qml @@ -1,13 +1,12 @@ import Quickshell.Io JsonObject { - property real corner_radius: 12.0 - property bool drop_shadow: true property bool enable_pp: true property string mode: "manual" - property bool rounded_corners: false - property int shadow_blur_passes: 1 - property real shadow_blur_radius: 22.0 + property real radius: 12.0 + property bool rounding: false + property bool shadow: true + property real shadow_blur: 22.0 property list shadow_color: [0, 0, 0, 160] property real shadow_offset_x: 5.0 property real shadow_offset_y: 5.0 diff --git a/Modules/Settings/Categories/Screenshot.qml b/Modules/Settings/Categories/Screenshot.qml index 260e7f9..21757d9 100644 --- a/Modules/Settings/Categories/Screenshot.qml +++ b/Modules/Settings/Categories/Screenshot.qml @@ -50,7 +50,7 @@ SettingsPage { min: 0 name: "Corner radius" object: Config.screenshot - setting: "corner_radius" + setting: "radius" shouldBeActive: Config.screenshot.mode === "manual" step: 1 } @@ -60,9 +60,9 @@ SettingsPage { } SettingSwitch { - name: "Enable drop shadow" + name: "Enable shadow" object: Config.screenshot - setting: "drop_shadow" + setting: "shadow" shouldBeActive: Config.screenshot.mode === "manual" } @@ -73,7 +73,7 @@ SettingsPage { SettingSwitch { name: "Enable rounded corners" object: Config.screenshot - setting: "rounded_corners" + setting: "rounding" shouldBeActive: Config.screenshot.mode === "manual" } @@ -83,9 +83,9 @@ SettingsPage { SettingSpinBox { min: 0 - name: "Shadow blur radius" + name: "Shadow blur amount" object: Config.screenshot - setting: "shadow_blur_radius" + setting: "shadow_blur" shouldBeActive: Config.screenshot.mode === "manual" step: 1 } @@ -94,29 +94,29 @@ SettingsPage { shouldBeActive: Config.screenshot.mode === "manual" } - SettingSwitch { - name: "Shadow color broken atm" - object: Config.Screenshot - setting: "shadow_color" - shouldBeActive: Config.screenshot.mode === "manual" - } + // SettingSwitch { + // name: "Shadow color broken atm" + // object: Config.Screenshot + // setting: "shadow_color" + // shouldBeActive: Config.screenshot.mode === "manual" + // } + // + // Separator { + // shouldBeActive: Config.screenshot.mode === "manual" + // } - Separator { - shouldBeActive: Config.screenshot.mode === "manual" - } - - SettingSpinBox { - min: 1 - name: "Shadow passes" - object: Config.screenshot - setting: "shadow_blur_passes" - shouldBeActive: Config.screenshot.mode === "manual" - step: 1 - } - - Separator { - shouldBeActive: Config.screenshot.mode === "manual" - } + // SettingSpinBox { + // min: 1 + // name: "Shadow passes" + // object: Config.screenshot + // setting: "shadow_blur_passes" + // shouldBeActive: Config.screenshot.mode === "manual" + // step: 1 + // } + // + // Separator { + // shouldBeActive: Config.screenshot.mode === "manual" + // } SettingSpinBox { min: 0 diff --git a/scripts/SettingsIndex.mjs b/scripts/SettingsIndex.mjs index d5aec75..ba5eaed 100644 --- a/scripts/SettingsIndex.mjs +++ b/scripts/SettingsIndex.mjs @@ -1011,7 +1011,7 @@ export const settingsIndex = [ keywords: ["corner", "radius"], }, { - name: "Enable drop shadow", + name: "Enable shadow", category: "screenshot", categoryName: "Screenshot", section: "Screenshot", @@ -1025,19 +1025,19 @@ export const settingsIndex = [ keywords: ["rounded", "corners"], }, { - name: "Shadow blur radius", + name: "Shadow blur amount", category: "screenshot", categoryName: "Screenshot", section: "Screenshot", keywords: ["blur", "shadow", "radius"], }, - { - name: "Shadow color", - category: "screenshot", - categoryName: "Screenshot", - section: "Screenshot", - keywords: ["color", "shadow"], - }, + // { + // name: "Shadow color", + // category: "screenshot", + // categoryName: "Screenshot", + // section: "Screenshot", + // keywords: ["color", "shadow"], + // }, { name: "Shadow offset X", category: "screenshot",