From d39901fe17dd958529637a61eb8bc7c1de8b9b11 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Tue, 17 Dec 2024 00:05:15 +0000 Subject: [PATCH 1/3] hyprpm: add pin for 0.46.0 --- hyprpm.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hyprpm.toml b/hyprpm.toml index 36c1c59..9009fad 100644 --- a/hyprpm.toml +++ b/hyprpm.toml @@ -23,7 +23,8 @@ commit_pins = [ ["4520b30d498daca8079365bdb909a8dea38e8d55", "9215288eb2ded9d0c08d468ea90ba68f43162c67"], # 0.44.1 ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "44859f877739c05d031fcab4a2991ec004fa9bc4"], # 0.45.0 ["500d2a3580388afc8b620b0a3624147faa34f98b", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.1 - ["12f9a0d0b93f691d4d9923716557154d74777b0a", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"] # 0.45.2 + ["12f9a0d0b93f691d4d9923716557154d74777b0a", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.2 + ["788ae588979c2a1ff8a660f16e3c502ef5796755", "2530394e67b436f4aea8225111cf37c1403ccb78"] # 0.46.0 ] [borders-plus-plus] From 17ef806444fee729d00b3ba5cb8c623b7fbb699b Mon Sep 17 00:00:00 2001 From: Vaxry Date: Tue, 17 Dec 2024 00:27:36 +0000 Subject: [PATCH 2/3] hyprbars: chase hyprland --- hyprbars/barDeco.cpp | 10 +++++----- hyprbars/barDeco.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hyprbars/barDeco.cpp b/hyprbars/barDeco.cpp index cf0ed92..99dbf87 100644 --- a/hyprbars/barDeco.cpp +++ b/hyprbars/barDeco.cpp @@ -562,13 +562,13 @@ void CHyprBar::updateRules() { m_bTitleColorChanged = true; } -void CHyprBar::applyRule(const SWindowRule& r) { - auto arg = r.szRule.substr(r.szRule.find_first_of(' ') + 1); +void CHyprBar::applyRule(const SP& r) { + auto arg = r->szRule.substr(r->szRule.find_first_of(' ') + 1); - if (r.szRule == "plugin:hyprbars:nobar") + if (r->szRule == "plugin:hyprbars:nobar") m_bHidden = true; - else if (r.szRule.starts_with("plugin:hyprbars:bar_color")) + else if (r->szRule.starts_with("plugin:hyprbars:bar_color")) m_bForcedBarColor = CHyprColor(configStringToInt(arg).value_or(0)); - else if (r.szRule.starts_with("plugin:hyprbars:title_color")) + else if (r->szRule.starts_with("plugin:hyprbars:title_color")) m_bForcedTitleColor = CHyprColor(configStringToInt(arg).value_or(0)); } diff --git a/hyprbars/barDeco.hpp b/hyprbars/barDeco.hpp index b63407d..070b1b1 100644 --- a/hyprbars/barDeco.hpp +++ b/hyprbars/barDeco.hpp @@ -35,7 +35,7 @@ class CHyprBar : public IHyprWindowDecoration { PHLWINDOW getOwner(); void updateRules(); - void applyRule(const SWindowRule&); + void applyRule(const SP&); private: SBoxExtents m_seExtents; From 3dcca4c0d40925fbb69a67be54eef1cf8730843c Mon Sep 17 00:00:00 2001 From: Vaxry Date: Tue, 17 Dec 2024 00:27:51 +0000 Subject: [PATCH 3/3] hyprpm: update pin --- hyprpm.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyprpm.toml b/hyprpm.toml index 9009fad..986a9d9 100644 --- a/hyprpm.toml +++ b/hyprpm.toml @@ -24,7 +24,7 @@ commit_pins = [ ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "44859f877739c05d031fcab4a2991ec004fa9bc4"], # 0.45.0 ["500d2a3580388afc8b620b0a3624147faa34f98b", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.1 ["12f9a0d0b93f691d4d9923716557154d74777b0a", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.2 - ["788ae588979c2a1ff8a660f16e3c502ef5796755", "2530394e67b436f4aea8225111cf37c1403ccb78"] # 0.46.0 + ["788ae588979c2a1ff8a660f16e3c502ef5796755", "17ef806444fee729d00b3ba5cb8c623b7fbb699b"] # 0.46.0 ] [borders-plus-plus]