better config

Author: littleblack111

src/config/ConfigDescriptions.hpp

@@ -33,16 +33,11 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = {
         .data        = SConfigOptionDescription::SStringData{"20"},
     },
     SConfigOptionDescription{
-        .value       = "general:float_gaps_in",
-        .description = "gaps between windows for floating windows\n\nsupports css style gaps (top, right, bottom, left -> 5 10 15 20)",
+        .value       = "general:float_gaps",
+        .description = "gaps between windows and monitor edges for floating windows\n\nsupports css style gaps (top, right, bottom, left -> 5 10 15 20). \n-1 means default "
+                       "gaps_in/gaps_out\n0 means no gaps",
         .type        = CONFIG_OPTION_STRING_SHORT,
-        .data        = SConfigOptionDescription::SStringData{"5"},
-    },
-    SConfigOptionDescription{
-        .value       = "general:float_gaps_out",
-        .description = "gaps between windows and monitor edges for floating windows\n\nsupports css style gaps (top, right, bottom, left -> 5 10 15 20)",
-        .type        = CONFIG_OPTION_STRING_SHORT,
-        .data        = SConfigOptionDescription::SStringData{"20"},
+        .data        = SConfigOptionDescription::SStringData{"0"},
     },
     SConfigOptionDescription{
         .value       = "general:gaps_workspaces",

src/config/ConfigManager.cpp

@@ -444,8 +444,7 @@ CConfigManager::CConfigManager() {
     registerConfigVar("general:no_border_on_floating", Hyprlang::INT{0});
     registerConfigVar("general:gaps_in", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "5"});
     registerConfigVar("general:gaps_out", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "20"});
-    registerConfigVar("general:float_gaps_in", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "5"});
-    registerConfigVar("general:float_gaps_out", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "20"});
+    registerConfigVar("general:float_gaps", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "0"});
     registerConfigVar("general:gaps_workspaces", Hyprlang::INT{0});
     registerConfigVar("general:no_focus_fallback", Hyprlang::INT{0});
     registerConfigVar("general:resize_on_border", Hyprlang::INT{0});
@@ -1318,6 +1317,8 @@ SWorkspaceRule CConfigManager::mergeWorkspaceRules(const SWorkspaceRule& rule1,
         mergedRule.gapsIn = rule2.gapsIn;
     if (rule2.gapsOut.has_value())
         mergedRule.gapsOut = rule2.gapsOut;
+    if (rule2.float_gaps)
+        mergedRule.float_gaps = rule2.float_gaps;
     if (rule2.borderSize.has_value())
         mergedRule.borderSize = rule2.borderSize;
     if (rule2.noBorder.has_value())

src/config/ConfigManager.hpp

@@ -36,8 +36,7 @@ struct SWorkspaceRule {
     bool                               isPersistent    = false;
     std::optional<CCssGapData>         gapsIn;
     std::optional<CCssGapData>         gapsOut;
-    std::optional<CCssGapData>         float_gapsIn  = gapsIn;
-    std::optional<CCssGapData>         float_gapsOut = gapsOut;
+    std::optional<CCssGapData>         float_gaps = gapsOut;
     std::optional<int64_t>             borderSize;
     std::optional<bool>                decorate;
     std::optional<bool>                noRounding;

src/managers/KeybindManager.cpp

@@ -1685,10 +1685,13 @@ SDispatchResult CKeybindManager::moveActiveTo(std::string args) {
 
     if (PLASTWINDOW->m_isFloating) {
         std::optional<float> vPosx, vPosy;
-        const auto           PMONITOR     = PLASTWINDOW->m_monitor.lock();
-        const auto           BORDERSIZE   = PLASTWINDOW->getRealBorderSize();
-        static auto          PGAPSOUTDATA = CConfigValue<Hyprlang::CUSTOMTYPE>("general:float_gaps_out");
-        auto* const          PGAPSOUT     = (CCssGapData*)(PGAPSOUTDATA.ptr())->getData();
+        const auto           PMONITOR        = PLASTWINDOW->m_monitor.lock();
+        const auto           BORDERSIZE      = PLASTWINDOW->getRealBorderSize();
+        static auto          PGAPSCUSTOMDATA = CConfigValue<Hyprlang::CUSTOMTYPE>("general:float_gaps");
+        static auto          PGAPSOUTDATA    = CConfigValue<Hyprlang::CUSTOMTYPE>("general:gaps_out");
+        auto*                PGAPSOUT        = (CCssGapData*)PGAPSCUSTOMDATA.ptr()->getData();
+        if (PGAPSOUT->m_left < 0 || PGAPSOUT->m_right < 0 || PGAPSOUT->m_top < 0 || PGAPSOUT->m_bottom < 0)
+            PGAPSOUT = (CCssGapData*)PGAPSOUTDATA.ptr()->getData();
 
         switch (arg) {
             case 'l': vPosx = PMONITOR->m_reservedTopLeft.x + BORDERSIZE + PMONITOR->m_position.x + PGAPSOUT->m_left; break;