From e2c4eb61857cbf468a8c7d9d54351441584c466b Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 29 Oct 2021 23:25:07 +0200 Subject: [PATCH] Bar::setLayout: take layout name instead of number --- src/bar.cpp | 2 +- src/bar.hpp | 2 +- src/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index 4ba2b3c..6ebbea2 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -115,7 +115,7 @@ void Bar::setTag(int tag, znet_tapesoftware_dwl_wm_monitor_v1_tag_state state, i t.focusedClient = focusedClient; } void Bar::setSelected(bool selected) { _selected = selected; } -void Bar::setLayout(int layout) { _layoutCmp.setText(layoutNames[layout]); } +void Bar::setLayout(const std::string& layout) { _layoutCmp.setText(layout); } void Bar::setTitle(const std::string& title) { _titleCmp.setText(title); } void Bar::setStatus(const std::string& status) { _statusCmp.setText(status); } diff --git a/src/bar.hpp b/src/bar.hpp index 4fc72e9..bddbbb6 100644 --- a/src/bar.hpp +++ b/src/bar.hpp @@ -67,7 +67,7 @@ public: void hide(); void setTag(int tag, znet_tapesoftware_dwl_wm_monitor_v1_tag_state state, int numClients, int focusedClient); void setSelected(bool selected); - void setLayout(int layout); + void setLayout(const std::string& layout); void setTitle(const std::string& title); void setStatus(const std::string& status); void invalidate(); diff --git a/src/main.cpp b/src/main.cpp index 6d44dd8..d6debcb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -231,7 +231,7 @@ static const struct znet_tapesoftware_dwl_wm_monitor_v1_listener dwlWmMonitorLis }, .layout = [](void* mv, znet_tapesoftware_dwl_wm_monitor_v1*, uint32_t layout) { auto mon = static_cast(mv); - mon->bar->setLayout(layout); + mon->bar->setLayout(layoutNames[layout]); }, .title = [](void* mv, znet_tapesoftware_dwl_wm_monitor_v1*, const char* title) { auto mon = static_cast(mv);