Merge branch 'staging'

aesophor · Feb 5, 2019 · de4760d · de4760d
2 parents 8de5c42 + 21c54d7
commit de4760d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/assets/floating.png b/assets/floating.png
diff --git a/assets/scrot.jpg b/assets/scrot.jpg
diff --git a/assets/tiling.png b/assets/tiling.png
diff --git a/src/config.cpp b/src/config.cpp
@@ -232,3 +232,4 @@ const unordered_map<string, vector<Action>>& Config::keybind_rules() const {
 const vector<string>& Config::autostart_rules() const {
     return autostart_rules_;
 }
+
diff --git a/src/wm.cpp b/src/wm.cpp
@@ -296,7 +296,7 @@ void WindowManager::OnKeyPress(const XKeyEvent& e) {
             wm_utils::KeysymToStr(dpy_, e.keycode) // key str, e.g., "q"
     );
 
-    for (auto action : actions) {
+    for (auto action : actions) { 
         switch (action.type()) {
             case ActionType::TILE_H:
                 workspaces_[current_]->SetTilingDirection(Direction::HORIZONTAL);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -232,3 +232,4 @@ const unordered_map<string, vector<Action>>& Config::keybind_rules() const {
		const vector<string>& Config::autostart_rules() const {
		return autostart_rules_;
		}