PolytreeDE
/
polytreewm
1
0
Fork 0
Code Issues 4 Releases Activity

Remove master area factor from actual state

This commit is contained in:
Alex Kotov 2021-11-18 22:34:11 +05:00
parent bdaed84429
commit c781eaaf9a
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dwm.c
View File

@ -164,7 +164,6 @@ struct Monitor {
// actual state
bool show_bar;
float mfact;
};
typedef struct {
@ -706,7 +705,6 @@ createmon(void)
// actual state
m->show_bar = unit_get_show_bar(m->pertag->units[m->pertag->curtag]);
m->mfact = unit_get_master_area_factor(m->pertag->units[m->pertag->curtag]);
return m;
@ -1620,8 +1618,7 @@ setmfact(const Arg *arg)
{
if (!arg) return;
// actual state
selmon->mfact = unit_inc_master_area_factor(
unit_inc_master_area_factor(
selmon->pertag->units[selmon->pertag->curtag],
arg->f
);
@ -1868,10 +1865,6 @@ toggleview(const Arg *arg)
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
// actual state
// TODO: maybe also set selmon->show_bar here to fix issue #7?
selmon->mfact = unit_get_master_area_factor(selmon->pertag->units[selmon->pertag->curtag]);
if (selmon->show_bar !=
unit_get_show_bar(selmon->pertag->units[selmon->pertag->curtag]))
{
@ -2177,10 +2170,6 @@ view(const Arg *arg)
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt ^ 1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
// actual state
// TODO: maybe also set selmon->show_bar here to fix issue #7?
selmon->mfact = unit_get_master_area_factor(selmon->pertag->units[selmon->pertag->curtag]);
if (selmon->show_bar !=
unit_get_show_bar(selmon->pertag->units[selmon->pertag->curtag]))
{
@ -2225,10 +2214,6 @@ viewrel(const Arg *arg)
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt ^ 1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
// actual state
// TODO: maybe also set selmon->show_bar here to fix issue #7?
selmon->mfact = unit_get_master_area_factor(selmon->pertag->units[selmon->pertag->curtag]);
if (selmon->show_bar !=
unit_get_show_bar(selmon->pertag->units[selmon->pertag->curtag]))
{

15
src/dwm/layouts.c
View File

@ -8,12 +8,15 @@ centeredmaster(Monitor *m)
for (Client *c = nexttiled(m->clients); c; c = nexttiled(c->next), ++n);
if (n == 0) return;
const bool master_area_factor =
unit_get_master_area_factor(m->pertag->units[m->pertag->curtag]);
unsigned int mx = 0;
unsigned int mw = m->ww;
unsigned int tw = mw;
if (n > m->nmaster) {
/* go mfact box in the center if more than nmaster clients */
mw = m->nmaster ? m->ww * m->mfact : 0;
mw = m->nmaster ? m->ww * master_area_factor : 0;
tw = m->ww - mw;
if (n - m->nmaster > 1) {
@ -108,6 +111,9 @@ horizontile(Monitor *m)
for (Client *c = nexttiled(m->clients); c; c = nexttiled(c->next), ++n);
if (n == 0) return;
const bool master_area_factor =
unit_get_master_area_factor(m->pertag->units[m->pertag->curtag]);
const bool is_fullscreen = m->sel == NULL ? false : m->sel->isfullscreen;
const int gap_size = helpers_gap_size(n, is_fullscreen, is_fullscreen);
@ -116,7 +122,7 @@ horizontile(Monitor *m)
const int top_left_half_gap = gap_size / 2;
const int bottom_right_half_gap = gap_size - top_left_half_gap;
const unsigned int mh = n > m->nmaster ? (m->nmaster ? m->wh * m->mfact : 0) : m->wh;
const unsigned int mh = n > m->nmaster ? (m->nmaster ? m->wh * master_area_factor : 0) : m->wh;
Client *c = nexttiled(m->clients);
@ -202,6 +208,9 @@ tile(Monitor *m)
for (Client *c = nexttiled(m->clients); c; c = nexttiled(c->next), ++n);
if (n == 0) return;
const bool master_area_factor =
unit_get_master_area_factor(m->pertag->units[m->pertag->curtag]);
const bool is_fullscreen = m->sel == NULL ? false : m->sel->isfullscreen;
const int gap_size = helpers_gap_size(n, is_fullscreen, is_fullscreen);
@ -210,7 +219,7 @@ tile(Monitor *m)
const int top_left_half_gap = gap_size / 2;
const int bottom_right_half_gap = gap_size - top_left_half_gap;
const unsigned int mw = n > m->nmaster ? (m->nmaster ? m->ww * m->mfact : 0) : m->ww;
const unsigned int mw = n > m->nmaster ? (m->nmaster ? m->ww * master_area_factor : 0) : m->ww;
Client *c = nexttiled(m->clients);