RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: deprecate instead of remove persistent_workspaces

pull/2468/head
khaneliman 2023-09-05 13:45:09 -05:00 committed by Austin Horstman
parent b405dc436c
commit c9e1899594
No known key found for this signature in database
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/hyprland/workspaces.cpp
View File

@ -231,8 +231,15 @@ void Workspaces::remove_workspace(std::string name) {
} }
void Workspaces::fill_persistent_workspaces() { void Workspaces::fill_persistent_workspaces() {
if (config_["persistent-workspaces"].isObject()) { if (config_["persistent_workspaces"].isObject()) {
const Json::Value persistent_workspaces = config_["persistent-workspaces"]; spdlog::warn(
"persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
}
if (config_["persistent-workspaces"].isObject() || config_["persistent_workspaces"].isObject()) {
const Json::Value persistent_workspaces = config_["persistent-workspaces"].isObject()
? config_["persistent-workspaces"]
: config_["persistent_workspaces"];
const std::vector<std::string> keys = persistent_workspaces.getMemberNames(); const std::vector<std::string> keys = persistent_workspaces.getMemberNames();
for (const std::string &key : keys) { for (const std::string &key : keys) {

13
src/modules/sway/workspaces.cpp
View File

@ -79,9 +79,18 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
: true; : true;
}); });
if (config_["persistent_workspaces"].isObject()) {
spdlog::warn(
"persistent_workspaces is deprecated. Please change config to use "
"persistent-workspaces.");
}
// adding persistent workspaces (as per the config file) // adding persistent workspaces (as per the config file)
if (config_["persistent-workspaces"].isObject()) { if (config_["persistent-workspaces"].isObject() ||
const Json::Value &p_workspaces = config_["persistent-workspaces"]; config_["persistent_workspaces"].isObject()) {
const Json::Value &p_workspaces = config_["persistent-workspaces"].isObject()
? config_["persistent-workspaces"]
: config_["persistent_workspaces"];
const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames(); const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames();
for (const std::string &p_w_name : p_workspaces_names) { for (const std::string &p_w_name : p_workspaces_names) {

13
src/modules/wlr/workspace_manager.cpp
View File

@ -209,8 +209,17 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value
} }
auto WorkspaceGroup::fill_persistent_workspaces() -> void { auto WorkspaceGroup::fill_persistent_workspaces() -> void {
if (config_["persistent-workspaces"].isObject() && !workspace_manager_.all_outputs()) { if (config_["persistent_workspaces"].isObject()) {
const Json::Value &p_workspaces = config_["persistent-workspaces"]; spdlog::warn(
"persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
}
if ((config_["persistent-workspaces"].isObject() ||
config_["persistent_workspaces"].isObject()) &&
!workspace_manager_.all_outputs()) {
const Json::Value &p_workspaces = config_["persistent-workspaces"].isObject()
? config_["persistent-workspaces"]
: config_["persistent_workspaces"];
const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames(); const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames();
for (const std::string &p_w_name : p_workspaces_names) { for (const std::string &p_w_name : p_workspaces_names) {