nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly align stuff when the icon is on the right side

Browse source
This commit is contained in:
Dana Jansens 2007-05-27 23:33:27 +00:00
parent 6bb61c3095
commit 078f6e5ad0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
openbox/frame.c
View file

@ -1014,7 +1014,7 @@ static void layout_title(ObFrame *self)
/* position of the left most button */ /* position of the left most button */
const gint left = ob_rr_theme->paddingx + 1; const gint left = ob_rr_theme->paddingx + 1;
/* position of the right most button */ /* position of the right most button */
const gint right = self->width - bwidth; const gint right = self->width;
/* turn them all off */ /* turn them all off */
self->icon_on = self->desk_on = self->shade_on = self->iconify_on = self->icon_on = self->desk_on = self->shade_on = self->iconify_on =
@ -1055,43 +1055,49 @@ static void layout_title(ObFrame *self)
if ((self->icon_on = is_button_present(self, lc, i))) { if ((self->icon_on = is_button_present(self, lc, i))) {
/* icon is bigger than buttons */ /* icon is bigger than buttons */
self->label_width -= bwidth + 2; self->label_width -= bwidth + 2;
self->icon_x = x; if (i > 0) self->icon_x = x;
x += i * (bwidth + 2); x += i * (bwidth + 2);
if (i < 0) self->icon_x = x;
} }
} else if (*lc == 'D') { } else if (*lc == 'D') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_ALLDESKTOPS; if (firstcon) *firstcon = OB_FRAME_CONTEXT_ALLDESKTOPS;
if ((self->desk_on = is_button_present(self, lc, i))) { if ((self->desk_on = is_button_present(self, lc, i))) {
self->label_width -= bwidth; self->label_width -= bwidth;
self->desk_x = x; if (i > 0) self->desk_x = x;
x += i * bwidth; x += i * bwidth;
if (i < 0) self->desk_x = x;
} }
} else if (*lc == 'S') { } else if (*lc == 'S') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_SHADE; if (firstcon) *firstcon = OB_FRAME_CONTEXT_SHADE;
if ((self->shade_on = is_button_present(self, lc, i))) { if ((self->shade_on = is_button_present(self, lc, i))) {
self->label_width -= bwidth; self->label_width -= bwidth;
self->shade_x = x; if (i > 0) self->shade_x = x;
x += i * bwidth; x += i * bwidth;
if (i < 0) self->shade_x = x;
} }
} else if (*lc == 'I') { } else if (*lc == 'I') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICONIFY; if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICONIFY;
if ((self->iconify_on = is_button_present(self, lc, i))) { if ((self->iconify_on = is_button_present(self, lc, i))) {
self->label_width -= bwidth; self->label_width -= bwidth;
self->iconify_x = x; if (i > 0) self->iconify_x = x;
x += i * bwidth; x += i * bwidth;
if (i < 0) self->iconify_x = x;
} }
} else if (*lc == 'M') { } else if (*lc == 'M') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_MAXIMIZE; if (firstcon) *firstcon = OB_FRAME_CONTEXT_MAXIMIZE;
if ((self->max_on = is_button_present(self, lc, i))) { if ((self->max_on = is_button_present(self, lc, i))) {
self->label_width -= bwidth; self->label_width -= bwidth;
self->max_x = x; if (i > 0) self->max_x = x;
x += i * bwidth; x += i * bwidth;
if (i < 0) self->max_x = x;
} }
} else if (*lc == 'C') { } else if (*lc == 'C') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE; if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE;
if ((self->close_on = is_button_present(self, lc, i))) { if ((self->close_on = is_button_present(self, lc, i))) {
self->label_width -= bwidth; self->label_width -= bwidth;
self->close_x = x; if (i > 0) self->close_x = x;
x += i * bwidth; x += i * bwidth;
if (i < 0) self->close_x = x;
} }
} else } else
continue; /* don't set firstcon */ continue; /* don't set firstcon */