hyprwm/Hypr
1
0
Fork 0
mirror of https://github.com/hyprwm/Hypr.git synced 2025-12-24 21:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed y resize speed

Browse source
This commit is contained in:
end-4 2023-01-23 20:59:35 +07:00
parent ae0eb7d0a2
commit c86deba103
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config/ConfigManager.cpp
View file

@ -131,7 +131,7 @@ void handleBind(const std::string& command, const std::string& value) {
if (HANDLER == "movefocus") dispatcher = KeybindManager::movefocus;
if (HANDLER == "movetoworkspace") dispatcher = KeybindManager::movetoworkspace;
if (HANDLER == "movetorelativeworkspace") dispatcher = KeybindManager::movetorelativeworkspace;
if (HANDLER == "workspace" || HANDLER == "ws") dispatcher = KeybindManager::changeworkspace;
if (HANDLER == "workspace") dispatcher = KeybindManager::changeworkspace;
if (HANDLER == "lastworkspace") dispatcher = KeybindManager::changetolastworkspace;
if (HANDLER == "togglefloating") dispatcher = KeybindManager::toggleActiveWindowFloating;
if (HANDLER == "splitratio") dispatcher = KeybindManager::changeSplitRatio;

15
src/windowManager.cpp
View file

@ -1761,9 +1761,6 @@ void CWindowManager::moveActiveFocusTo(char dir) {
}
void CWindowManager::changeWorkspaceByID(int ID) {
activeWorkspaceID = ID;
auto MONITOR = getMonitorFromCursor();
if (!MONITOR) {
@ -1801,8 +1798,9 @@ void CWindowManager::changeWorkspaceByID(int ID) {
// if fullscreen, set to the fullscreen window
focusOnWorkspace(ID);
// Update bar info
// Update bar info, activeWorkspaceID
updateBarInfo();
activeWorkspaceID = ID;
Debug::log(LOG, "Bar info updated with workspace changed.");
@ -1823,8 +1821,9 @@ void CWindowManager::changeWorkspaceByID(int ID) {
activeWorkspaces[MONITOR->ID] = workspaces[workspaces.size() - 1].getID();
LastWindow = -1;
// Update bar info
// Update bar info, activeWorkspaceID
updateBarInfo();
activeWorkspaceID = ID;
// Wipe animation
startWipeAnimOnWorkspace(OLDWORKSPACE, ID);
@ -2488,7 +2487,7 @@ void CWindowManager::recalcAllDocks() {
void CWindowManager::startWipeAnimOnWorkspace(const int& oldwork, const int& newwork) {
const auto PMONITOR = getMonitorFromWorkspace(newwork);
if (newwork < oldwork) { //Swipe from left to right
if (newwork < oldwork) { // Wipe from left to right
for (auto& work : workspaces) {
if (work.getID() == oldwork) {
if (ConfigManager::getInt("animations:workspaces") == 1)
@ -2507,7 +2506,7 @@ void CWindowManager::startWipeAnimOnWorkspace(const int& oldwork, const int& new
}
}
}
else { //Swipe from right to left (oldwork < newwork)
else { // Wipe from right to left (oldwork < newwork)
for (auto& work : workspaces) {
if (work.getID() == oldwork) {
if (ConfigManager::getInt("animations:workspaces") == 1)
@ -2676,7 +2675,7 @@ void CWindowManager::processCursorDeltaOnWindowResizeTiled(CWindow* pWindow, con
const auto TOPCONTAINER = PARENTSIDEBYSIDE ? PPARENT2 : PPARENT;
allowedMovement.x *= 2.f / SIDECONTAINER->getSize().x;
allowedMovement.y *= 2.f / TOPCONTAINER->getSize().x;
allowedMovement.y *= 2.f / TOPCONTAINER->getSize().y;
SIDECONTAINER->setSplitRatio(std::clamp(SIDECONTAINER->getSplitRatio() + allowedMovement.x, (double)0.05f, (double)1.95f));
TOPCONTAINER->setSplitRatio(std::clamp(TOPCONTAINER->getSplitRatio() + allowedMovement.y, (double)0.05f, (double)1.95f));