Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-16 03:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update configuration to hyprlang

Browse source
This commit is contained in:
Pete Appleton 2024-02-18 23:23:05 +00:00
parent f3dd53d76a
commit 1255b2f508
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Hy3Layout.cpp
View file

@ -894,8 +894,7 @@ void Hy3Layout::shiftNode(Hy3Node& node, ShiftDirection direction, bool once, bo
} }
void shiftFloatingWindow(CWindow* window, ShiftDirection direction) { void shiftFloatingWindow(CWindow* window, ShiftDirection direction) {
static const auto* kbd_shift_delta = static const auto kbd_shift_delta = ConfigValue<Hyprlang::INT>("plugin:hy3:kbd_shift_delta");
&HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:kbd_shift_delta")->intValue;
if(!window) return; if(!window) return;
@ -1073,7 +1072,7 @@ CWindow* getWindowInDirection(CWindow* source, ShiftDirection direction, BitFlag
const auto current_surface_box = source->getWindowMainSurfaceBox(); const auto current_surface_box = source->getWindowMainSurfaceBox();
auto target_distance = Distance { direction }; auto target_distance = Distance { direction };
int focus_policy = *&HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:focus_obscured_windows_policy")->intValue; int focus_policy = *ConfigValue<Hyprlang::INT>("plugin:hy3:focus_obscured_windows_policy");
bool permit_obscured_windows = focus_policy == 0 || (focus_policy == 2 && layers_same_monitor.HasNot(Layer::Floating | Layer::Tiled)); bool permit_obscured_windows = focus_policy == 0 || (focus_policy == 2 && layers_same_monitor.HasNot(Layer::Floating | Layer::Tiled));
// TODO: Don't assume that source window is on focused monitor // TODO: Don't assume that source window is on focused monitor
@ -1159,7 +1158,7 @@ void Hy3Layout::shiftFocus(int workspace, ShiftDirection direction, bool visible
// If no eligible_layers specified then choose the same layer as the source window // If no eligible_layers specified then choose the same layer as the source window
if(eligible_layers == Layer::None) eligible_layers = source_window->m_bIsFloating ? Layer::Floating : Layer::Tiled; if(eligible_layers == Layer::None) eligible_layers = source_window->m_bIsFloating ? Layer::Floating : Layer::Tiled;
int focus_policy = *&HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:focus_obscured_windows_policy")->intValue; int focus_policy = *ConfigValue<Hyprlang::INT>("plugin:hy3:focus_obscured_windows_policy");
bool skip_obscured = focus_policy == 1 || (focus_policy == 2 && eligible_layers.Has(Layer::Floating | Layer::Tiled)); bool skip_obscured = focus_policy == 1 || (focus_policy == 2 && eligible_layers.Has(Layer::Floating | Layer::Tiled));
// Determine the starting point for looking for a tiled node - it's either the // Determine the starting point for looking for a tiled node - it's either the

2
src/dispatchers.cpp
View file

@ -134,7 +134,7 @@ void dispatch_movefocus(std::string value) {
} }
if(!layerArg) { if(!layerArg) {
auto default_movefocus_layer = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:default_movefocus_layer")->strValue; auto default_movefocus_layer = ConfigValue<Hyprlang::STRING>("plugin:hy3:default_movefocus_layer");
if((layerArg = parseLayerArg(*default_movefocus_layer))) layers = layerArg.value(); if((layerArg = parseLayerArg(*default_movefocus_layer))) layers = layerArg.value();
} }