Skip to content

Enlarged (big) close button by adding 'close.button.percent' parameter to theme #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Novator wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enlarged (big) close button by adding 'close.button.percent' parameter to theme #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions obrender/theme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_INT("window.handle.width", theme->handle_height, 0, 100, 6);
READ_INT("padding.width", theme->paddingx, 0, 100, 3);
READ_INT("padding.height", theme->paddingy, 0, 100, theme->paddingx);
READ_INT("close.button.percent", theme->close_button_percent, 0, 300, 100);
READ_INT("border.width", theme->fbwidth, 0, 100, 1);
READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth);
READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth);
Expand Down Expand Up @@ -983,6 +984,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->paddingy * 2;
}
theme->button_size = theme->label_height - 2;
if (theme->close_button_percent>0) {
theme->close_button_size = (gint)(theme->button_size * theme->close_button_percent / 100);
} else {
theme->close_button_size = theme->button_size;
}
theme->grip_width = 25;

RrAppearanceFree(fbs.focused_disabled);
Expand Down
2 changes: 2 additions & 0 deletions obrender/theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ struct _RrTheme {
gint label_height;
gint title_height;
gint button_size;
gint close_button_size;
gint close_button_percent;
gint grip_width;
gint menu_title_label_height;
gint menu_title_height;
Expand Down
5 changes: 3 additions & 2 deletions openbox/frame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static void set_theme_statics(ObFrame *self)
XResizeWindow(obt_display, self->icon,
ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
XResizeWindow(obt_display, self->close,
ob_rr_theme->button_size, ob_rr_theme->button_size);
ob_rr_theme->close_button_size, ob_rr_theme->button_size);
XResizeWindow(obt_display, self->desk,
ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(obt_display, self->shade,
Expand Down Expand Up @@ -1183,6 +1183,7 @@ static void layout_title(ObFrame *self)
gint i;

const gint bwidth = ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
const gint close_bwidth = ob_rr_theme->close_button_size + ob_rr_theme->paddingx + 1;
/* position of the leftmost button */
const gint left = ob_rr_theme->paddingx + 1;
/* position of the rightmost button */
Expand Down Expand Up @@ -1240,7 +1241,7 @@ static void layout_title(ObFrame *self)
place_button(self, lc, bwidth, left, i, &x, &self->max_on, &self->max_x);
} else if (*lc == 'C') {
if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE;
place_button(self, lc, bwidth, left, i, &x, &self->close_on, &self->close_x);
place_button(self, lc, close_bwidth, left, i, &x, &self->close_on, &self->close_x);
} else
continue; /* don't set firstcon */
firstcon = NULL;
Expand Down
2 changes: 1 addition & 1 deletion openbox/framerender.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,5 +408,5 @@ static void framerender_close(ObFrame *self, RrAppearance *a)
{
if (!self->close_on) return;
RrPaint(a, self->close,
ob_rr_theme->button_size, ob_rr_theme->button_size);
ob_rr_theme->close_button_size, ob_rr_theme->button_size);
}
1 change: 1 addition & 0 deletions themes/Syscrash/openbox-3/themerc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ padding.width: 1
window.handle.width: 0
window.client.padding.width: 0
window.client.padding.height: 0
close.button.percent: 150

menu.overlap: 0

Expand Down