Merge branch 'hyprwm:main' into main

This commit is contained in:
caffeine 2024-12-17 11:39:19 +00:00 committed by GitHub
commit 545b2b7155
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions

View file

@ -646,13 +646,13 @@ void CHyprBar::updateRules() {
m_bTitleColorChanged = true; m_bTitleColorChanged = true;
} }
void CHyprBar::applyRule(const SWindowRule& r) { void CHyprBar::applyRule(const SP<CWindowRule>& r) {
auto arg = r.szRule.substr(r.szRule.find_first_of(' ') + 1); 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; 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)); 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)); m_bForcedTitleColor = CHyprColor(configStringToInt(arg).value_or(0));
} }

View file

@ -42,7 +42,7 @@ class CHyprBar : public IHyprWindowDecoration {
PHLWINDOW getOwner(); PHLWINDOW getOwner();
void updateRules(); void updateRules();
void applyRule(const SWindowRule&); void applyRule(const SP<CWindowRule>&);
private: private:
SBoxExtents m_seExtents; SBoxExtents m_seExtents;

View file

@ -23,7 +23,8 @@ commit_pins = [
["4520b30d498daca8079365bdb909a8dea38e8d55", "9215288eb2ded9d0c08d468ea90ba68f43162c67"], # 0.44.1 ["4520b30d498daca8079365bdb909a8dea38e8d55", "9215288eb2ded9d0c08d468ea90ba68f43162c67"], # 0.44.1
["a425fbebe4cf4238e48a42f724ef2208959d66cf", "44859f877739c05d031fcab4a2991ec004fa9bc4"], # 0.45.0 ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "44859f877739c05d031fcab4a2991ec004fa9bc4"], # 0.45.0
["500d2a3580388afc8b620b0a3624147faa34f98b", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.1 ["500d2a3580388afc8b620b0a3624147faa34f98b", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.1
["12f9a0d0b93f691d4d9923716557154d74777b0a", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"] # 0.45.2 ["12f9a0d0b93f691d4d9923716557154d74777b0a", "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2"], # 0.45.2
["788ae588979c2a1ff8a660f16e3c502ef5796755", "17ef806444fee729d00b3ba5cb8c623b7fbb699b"] # 0.46.0
] ]
[borders-plus-plus] [borders-plus-plus]