Merge pull request #327 from RX14/feature/disable-scroll-wraparound-option
Add option to disable scroll wraparound on workspaces
This commit is contained in:
commit
e70d8aff73
|
@ -215,7 +215,7 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
|
|||
|
||||
const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterator it,
|
||||
bool prev) const {
|
||||
if (prev && it == workspaces_.begin()) {
|
||||
if (prev && it == workspaces_.begin() && !config_["disable-scroll-wraparound"].asBool()) {
|
||||
return (*(--workspaces_.end()))["name"].asString();
|
||||
}
|
||||
if (prev && it != workspaces_.begin())
|
||||
|
@ -223,8 +223,12 @@ const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterat
|
|||
else if (!prev && it != workspaces_.end())
|
||||
++it;
|
||||
if (!prev && it == workspaces_.end()) {
|
||||
if (config_["disable-scroll-wraparound"].asBool()) {
|
||||
--it;
|
||||
} else {
|
||||
return (*(workspaces_.begin()))["name"].asString();
|
||||
}
|
||||
}
|
||||
return (*it)["name"].asString();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue