pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(config): Support fractional size and offset

Browse Source 
Fixes #953.
This commit is contained in:
Jon Gjengset 2018-01-21 17:54:15 -05:00 committed by NBonaparte
parent 39c12edc8a
commit 224ffa97c1
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/bar.cpp
View File

@ -248,17 +248,24 @@ bar::bar(connection& conn, signal_emitter& emitter, const config& config, const
auto offsetx = m_conf.get(m_conf.section(), "offset-x", ""s); auto offsetx = m_conf.get(m_conf.section(), "offset-x", ""s);
auto offsety = m_conf.get(m_conf.section(), "offset-y", ""s); auto offsety = m_conf.get(m_conf.section(), "offset-y", ""s);
if ((m_opts.size.w = atoi(w.c_str())) && w.find('%') != string::npos) { m_opts.size.w = atoi(w.c_str());
m_opts.size.w = math_util::percentage_to_value<int>(m_opts.size.w, m_opts.monitor->w); m_opts.size.h = atoi(h.c_str());
m_opts.offset.x = atoi(offsetx.c_str());
m_opts.offset.y = atoi(offsety.c_str());
// Evaluate percentages
double tmp;
if ((tmp = atof(w.c_str())) && w.find('%') != string::npos) {
m_opts.size.w = math_util::percentage_to_value<double>(tmp, m_opts.monitor->w);
} }
if ((m_opts.size.h = atoi(h.c_str())) && h.find('%') != string::npos) { if ((tmp = atof(h.c_str())) && h.find('%') != string::npos) {
m_opts.size.h = math_util::percentage_to_value<int>(m_opts.size.h, m_opts.monitor->h); m_opts.size.h = math_util::percentage_to_value<double>(tmp, m_opts.monitor->h);
} }
if ((m_opts.offset.x = atoi(offsetx.c_str())) != 0 && offsetx.find('%') != string::npos) { if ((tmp = atof(offsetx.c_str())) != 0 && offsetx.find('%') != string::npos) {
m_opts.offset.x = math_util::percentage_to_value<int>(m_opts.offset.x, m_opts.monitor->w); m_opts.offset.x = math_util::percentage_to_value<double>(tmp, m_opts.monitor->w);
} }
if ((m_opts.offset.y = atoi(offsety.c_str())) != 0 && offsety.find('%') != string::npos) { if ((tmp = atof(offsety.c_str())) != 0 && offsety.find('%') != string::npos) {
m_opts.offset.y = math_util::percentage_to_value<int>(m_opts.offset.y, m_opts.monitor->h); m_opts.offset.y = math_util::percentage_to_value<double>(tmp, m_opts.monitor->h);
} }
// Apply offsets // Apply offsets