summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-21 22:05:51 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-21 22:05:51 +0200
commit5b8cdc6c43636079c80a959db17328e7e58f6b18 (patch)
tree01cbf245673355ee1bc232af48e8ea0a20349396 /src
parent883d389bc283ac6b29b303a94f063e5575f8416f (diff)
CONFIG COMPAT BREAK: removed mfact from mon cfg
Diffstat (limited to 'src')
-rw-r--r--src/config/ConfigManager.cpp6
-rw-r--r--src/config/ConfigManager.hpp1
-rw-r--r--src/config/defaultConfig.hpp2
3 files changed, 2 insertions, 7 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index c4977518..64da8039 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -185,10 +185,6 @@ void CConfigManager::handleMonitor(const std::string& command, const std::string
nextItem();
- newrule.mfact = stof(curitem);
-
- nextItem();
-
newrule.scale = stof(curitem);
// overwrite if exists
@@ -547,7 +543,7 @@ SMonitorRule CConfigManager::getMonitorRuleFor(std::string name) {
Debug::log(WARN, "No rules configured. Using the default hardcoded one.");
- return SMonitorRule{.name = "", .resolution = Vector2D(1280, 720), .offset = Vector2D(0, 0), .mfact = 0.5f, .scale = 1};
+ return SMonitorRule{.name = "", .resolution = Vector2D(1280, 720), .offset = Vector2D(0, 0), .scale = 1};
}
std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow) {
diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp
index 4c2c5660..044b9751 100644
--- a/src/config/ConfigManager.hpp
+++ b/src/config/ConfigManager.hpp
@@ -22,7 +22,6 @@ struct SMonitorRule {
std::string name = "";
Vector2D resolution = Vector2D(1280,720);
Vector2D offset = Vector2D(0,0);
- float mfact = 0.5;
float scale = 1;
float refreshRate = 60;
int defaultWorkspaceID = -1;
diff --git a/src/config/defaultConfig.hpp b/src/config/defaultConfig.hpp
index 98e32d33..2f7937d7 100644
--- a/src/config/defaultConfig.hpp
+++ b/src/config/defaultConfig.hpp
@@ -11,7 +11,7 @@ OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
autogenerated=1 # remove this line to get rid of the warning on top.
-monitor=,1920x1080@60,0x0,0.5,1
+monitor=,1920x1080@60,0x0,1
input {
kb_layout=