hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 08:29:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

groups: add use_current_group_pos (#2759)

Browse source
This commit is contained in:
MightyPlaza 2023-07-20 17:48:32 +00:00 committed by GitHub
parent 6c1f4faff2
commit ca54ceff6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/Window.cpp
View file

@ -664,31 +664,24 @@ void CWindow::setGroupCurrent(CWindow* pWindow) {
} }
void CWindow::insertWindowToGroup(CWindow* pWindow) { void CWindow::insertWindowToGroup(CWindow* pWindow) {
const auto PHEAD = getGroupHead(); static const auto* USECURRPOS = &g_pConfigManager->getConfigValuePtr("misc:group_insert_after_current")->intValue;
const auto PTAIL = getGroupTail();
if (pWindow->m_sGroupData.pNextWindow) { const auto BEGINAT = *USECURRPOS ? this : getGroupTail();
const auto PHEAD = pWindow->getGroupHead(); const auto ENDAT = *USECURRPOS ? m_sGroupData.pNextWindow : getGroupHead();
std::vector<CWindow*> members;
CWindow* curr = PHEAD;
do {
const auto PLAST = curr;
members.push_back(curr);
curr = curr->m_sGroupData.pNextWindow;
PLAST->m_sGroupData.pNextWindow = nullptr;
PLAST->m_sGroupData.head = false;
PLAST->m_sGroupData.locked = false;
} while (curr != PHEAD);
for (auto& w : members) {
insertWindowToGroup(w);
}
if (!pWindow->m_sGroupData.pNextWindow) {
BEGINAT->m_sGroupData.pNextWindow = pWindow;
pWindow->m_sGroupData.pNextWindow = ENDAT;
pWindow->m_sGroupData.head = false;
return; return;
} }
PTAIL->m_sGroupData.pNextWindow = pWindow; const auto SHEAD = pWindow->getGroupHead();
pWindow->m_sGroupData.pNextWindow = PHEAD; const auto STAIL = pWindow->getGroupTail();
SHEAD->m_sGroupData.head = false;
BEGINAT->m_sGroupData.pNextWindow = SHEAD;
STAIL->m_sGroupData.pNextWindow = ENDAT;
} }
CWindow* CWindow::getGroupPrevious() { CWindow* CWindow::getGroupPrevious() {
@ -704,30 +697,23 @@ void CWindow::switchWithWindowInGroup(CWindow* pWindow) {
if (!m_sGroupData.pNextWindow || !pWindow->m_sGroupData.pNextWindow) if (!m_sGroupData.pNextWindow || !pWindow->m_sGroupData.pNextWindow)
return; return;
// TODO: probably can be done more easily but I let C++ do the algorithm stuff for us if (m_sGroupData.pNextWindow == pWindow) { // A -> this -> pWindow -> B >> A -> pWindow -> this -> B
getGroupPrevious()->m_sGroupData.pNextWindow = pWindow;
m_sGroupData.pNextWindow = pWindow->m_sGroupData.pNextWindow;
pWindow->m_sGroupData.pNextWindow = this;
std::vector<CWindow*> group; } else if (pWindow->m_sGroupData.pNextWindow == this) { // A -> pWindow -> this -> B >> A -> this -> pWindow -> B
group.push_back(this); pWindow->getGroupPrevious()->m_sGroupData.pNextWindow = this;
CWindow* curr = this->m_sGroupData.pNextWindow; pWindow->m_sGroupData.pNextWindow = m_sGroupData.pNextWindow;
while (curr != this) { m_sGroupData.pNextWindow = pWindow;
group.push_back(curr);
curr = curr->m_sGroupData.pNextWindow;
}
auto it1 = std::find(group.begin(), group.end(), this); } else { // A -> this -> B | C -> pWindow -> D >> A -> pWindow -> B | C -> this -> D
auto it2 = std::find(group.begin(), group.end(), pWindow); std::swap(m_sGroupData.pNextWindow, pWindow->m_sGroupData.pNextWindow);
std::swap(getGroupPrevious()->m_sGroupData.pNextWindow, pWindow->getGroupPrevious()->m_sGroupData.pNextWindow);
std::iter_swap(it1, it2);
for (auto it = group.begin(); it != group.end(); ++it) {
if (std::next(it) == group.end()) {
(*it)->m_sGroupData.pNextWindow = *group.begin();
} else {
(*it)->m_sGroupData.pNextWindow = *std::next(it);
}
} }
std::swap(m_sGroupData.head, pWindow->m_sGroupData.head); std::swap(m_sGroupData.head, pWindow->m_sGroupData.head);
std::swap(m_sGroupData.locked, pWindow->m_sGroupData.locked);
} }
void CWindow::updateGroupOutputs() { void CWindow::updateGroupOutputs() {

1
src/config/ConfigManager.cpp
View file

@ -107,6 +107,7 @@ void CConfigManager::setDefaultVars() {
configValues["misc:cursor_zoom_factor"].floatValue = 1.f; configValues["misc:cursor_zoom_factor"].floatValue = 1.f;
configValues["misc:cursor_zoom_rigid"].intValue = 0; configValues["misc:cursor_zoom_rigid"].intValue = 0;
configValues["misc:allow_session_lock_restore"].intValue = 0; configValues["misc:allow_session_lock_restore"].intValue = 0;
configValues["misc:group_insert_after_current"].intValue = 1;
configValues["misc:render_titles_in_groupbar"].intValue = 1; configValues["misc:render_titles_in_groupbar"].intValue = 1;
configValues["misc:groupbar_titles_font_size"].intValue = 8; configValues["misc:groupbar_titles_font_size"].intValue = 8;
configValues["misc:groupbar_gradients"].intValue = 1; configValues["misc:groupbar_gradients"].intValue = 1;

12
src/managers/KeybindManager.cpp
View file

@ -2035,14 +2035,14 @@ void CKeybindManager::moveIntoGroup(std::string args) {
if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow) if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow)
return; return;
if (PWINDOW->m_sGroupData.locked || PWINDOWINDIR->m_sGroupData.locked)
return;
if (!PWINDOW->m_sGroupData.pNextWindow) if (!PWINDOW->m_sGroupData.pNextWindow)
PWINDOW->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(PWINDOW)); PWINDOW->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(PWINDOW));
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); // This removes groupped property! g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); // This removes groupped property!
PWINDOW->m_sGroupData.locked = false;
PWINDOW->m_sGroupData.head = false;
PWINDOWINDIR->insertWindowToGroup(PWINDOW); PWINDOWINDIR->insertWindowToGroup(PWINDOW);
PWINDOWINDIR->setGroupCurrent(PWINDOW); PWINDOWINDIR->setGroupCurrent(PWINDOW);
PWINDOW->updateWindowDecos(); PWINDOW->updateWindowDecos();
@ -2086,9 +2086,11 @@ void CKeybindManager::moveGroupWindow(std::string args) {
if (!g_pCompositor->m_pLastWindow || !g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow) if (!g_pCompositor->m_pLastWindow || !g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow)
return; return;
if ((!BACK && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow->m_sGroupData.head) || (BACK && g_pCompositor->m_pLastWindow->m_sGroupData.head)) if ((!BACK && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow->m_sGroupData.head) || (BACK && g_pCompositor->m_pLastWindow->m_sGroupData.head)) {
std::swap(g_pCompositor->m_pLastWindow->m_sGroupData.head, g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow->m_sGroupData.head); std::swap(g_pCompositor->m_pLastWindow->m_sGroupData.head, g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow->m_sGroupData.head);
else std::swap(g_pCompositor->m_pLastWindow->m_sGroupData.locked, g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow->m_sGroupData.locked);
} else
g_pCompositor->m_pLastWindow->switchWithWindowInGroup(BACK ? g_pCompositor->m_pLastWindow->getGroupPrevious() : g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow); g_pCompositor->m_pLastWindow->switchWithWindowInGroup(BACK ? g_pCompositor->m_pLastWindow->getGroupPrevious() : g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow);
g_pCompositor->m_pLastWindow->updateWindowDecos(); g_pCompositor->m_pLastWindow->updateWindowDecos();
} }