Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix use CHyprColor #70

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Fix use CHyprColor #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
523ee83
fix: replace CColor with CHyprColor
WhySoBad Dec 5, 2024
980618a
fix: add hyprgraphics workflow dependency
WhySoBad Dec 5, 2024
6565bf9
fix: add missing hyprgraphics dependencies
WhySoBad Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/actions/setup_base/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ runs:
xcb-util \
xcb-util-image \
libzip \
librsvg
librsvg \
libwebp \
libjxl \
libjpeg-turbo

- name: Get hyprwayland-scanner-git
shell: bash
Expand Down Expand Up @@ -99,6 +102,15 @@ runs:
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
cmake --install build

- name: Get hyprgraphics
shell: bash
run: |
git clone https://github.com/hyprwm/hyprgraphics.git
cd hyprgraphics
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
cmake --install build

- name: Get Xorg pacman pkgs
shell: bash
if: inputs.INSTALL_XORG_PKGS == 'true'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SOURCE_FILES=$(wildcard src/*.cpp)
COMPILE_FLAGS=-shared -g -fPIC --no-gnu-unique -std=c++23 -Wall
COMPILE_FLAGS+=-Iinclude
COMPILE_FLAGS+=-DWLR_USE_UNSTABLE
INCLUDES = `pkg-config --cflags pixman-1 libdrm hyprland`
INCLUDES = `pkg-config --cflags pixman-1 libdrm hyprland`

all: $(PLUGIN_NAME).so

Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void parseNamesConf(std::string& conf) {
}
} catch (std::exception const& ex) {
// #aa1245
HyprlandAPI::addNotification(PHANDLE, "Syntax error in your virtual-desktops names config", CColor{4289335877}, 8000);
HyprlandAPI::addNotification(PHANDLE, "Syntax error in your virtual-desktops names config", CHyprColor{4289335877}, 8000);
}
}

Expand Down Expand Up @@ -354,7 +354,7 @@ void onMonitorAdded(void*, SCallbackInfo&, std::any val) {
void onConfigReloaded(void*, SCallbackInfo&, std::any val) {
static auto* const PNOTIFYINIT = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, NOTIFY_INIT)->getDataStaticPtr();
if (**PNOTIFYINIT && !notifiedInit) {
HyprlandAPI::addNotification(PHANDLE, "Virtual desk Initialized successfully!", CColor{0.f, 1.f, 1.f, 1.f}, 5000);
HyprlandAPI::addNotification(PHANDLE, "Virtual desk Initialized successfully!", CHyprColor{0.f, 1.f, 1.f, 1.f}, 5000);
notifiedInit = true;
}
static auto* const PVDESKNAMESCONF = (Hyprlang::STRING const*)(HyprlandAPI::getConfigValue(PHANDLE, VIRTUALDESK_NAMES_CONF))->getDataStaticPtr();
Expand Down
Loading