fabs/i3ipcpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6 from mox-mox/dev

Browse Source 
Fix for W: Got a unknown "border" property: "pixel".
This commit is contained in:
Sergey Naumov
2016-06-12 17:28:16 +03:00
committed by GitHub
parent c2e29dcbc6 99c7bd76ac
commit c77c5af006
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/i3ipc++/ipc.hpp
View File

@@ -111,6 +111,7 @@ enum class BorderStyle : char {
UNKNOWN = '?', //< If got an unknown border style in reply UNKNOWN = '?', //< If got an unknown border style in reply
NONE = 'N', NONE = 'N',
NORMAL = 'n', NORMAL = 'n',
PIXEL = 'P',
ONE_PIXEL = '1', ONE_PIXEL = '1',
}; };

2
src/ipc.cpp
View File

@@ -76,6 +76,8 @@ static std::shared_ptr<container_t> parse_container_from_json(const Json::Value
container->border = BorderStyle::NORMAL; container->border = BorderStyle::NORMAL;
} else if (border == "none") { } else if (border == "none") {
container->border = BorderStyle::NONE; container->border = BorderStyle::NONE;
} else if (border == "pixel") {
container->border = BorderStyle::PIXEL;
} else if (border == "1pixel") { } else if (border == "1pixel") {
container->border = BorderStyle::ONE_PIXEL; container->border = BorderStyle::ONE_PIXEL;
} else { } else {