Skip to content

Commit

Permalink
Merge pull request #184 from matt1432/chase-color
Browse files Browse the repository at this point in the history
  • Loading branch information
horriblename authored Dec 6, 2024
2 parents 1c52622 + f888e65 commit aecf810
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 19 deletions.
60 changes: 45 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion hyprpm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ commit_pins = [
["f044e4c9514ec89c4c1fc8a523ca90b8cb907fb7", "070ca398300bf5b9e1a636ca057882c0312c228d"], # CMonitor* -> PHLMONITOR
["a425fbebe4cf4238e48a42f724ef2208959d66cf", "a86ed5581498186ed31241c0c246629ef771d1e6"], # v0.45.0
["500d2a3580388afc8b620b0a3624147faa34f98b", "cb929099477407116031010905ce439db771dd62"], # v0.45.1
["12f9a0d0b93f691d4d9923716557154d74777b0a", "cb929099477407116031010905ce439db771dd62"], # v0.45.2
["12f9a0d0b93f691d4d9923716557154d74777b0a", "cb929099477407116031010905ce439db771dd62"], # v0.45.2
["320144ae7288fe23686935ebb235d9fe0c900862", "0c2c3dc676cee437cece6cca67965bbaba0e45b5"], # CColor -> CHyprColor
## DO NOT EDIT THIS LINE: for auto pin script ##
]

Expand Down
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <hyprutils/memory/SharedPtr.hpp>
#include <string>

const CColor s_pluginColor = {0x61 / 255.0f, 0xAF / 255.0f, 0xEF / 255.0f, 1.0f};
const CHyprColor s_pluginColor = {0x61 / 255.0f, 0xAF / 255.0f, 0xEF / 255.0f, 1.0f};

void hkOnTouchDown(void* _, SCallbackInfo& cbinfo, std::any e) {
auto ev = std::any_cast<ITouch::SDownEvent>(e);
Expand Down Expand Up @@ -116,7 +116,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
HyprlandAPI::addDispatcher(PHANDLE, "touchBind", [&](std::string args) {
HyprlandAPI::addNotification(
PHANDLE, "[hyprgrass] touchBind dispatcher deprecated, use the hyprgrass-bind keyword instead",
CColor(0.8, 0.2, 0.2, 1.0), 5000);
CHyprColor(0.8, 0.2, 0.2, 1.0), 5000);
g_pGestureManager->touchBindDispatcher(args);
});

Expand All @@ -127,7 +127,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {

if (hlVersion.hash != hlTargetVersion) {
HyprlandAPI::addNotification(PHANDLE, "Mismatched Hyprland version! check logs for details",
CColor(0.8, 0.7, 0.26, 1.0), 5000);
CHyprColor(0.8, 0.7, 0.26, 1.0), 5000);
Debug::log(ERR, "[hyprgrass] version mismatch!");
Debug::log(ERR, "[hyprgrass] | hyprgrass was built against: {}", hlTargetVersion);
Debug::log(ERR, "[hyprgrass] | actual hyprland version: {}", hlVersion.hash);
Expand Down

0 comments on commit aecf810

Please sign in to comment.