From 506c1aa005d0328d4d32e123d437c6afe92b8ea4 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 31 Mar 2003 19:38:24 +0000 Subject: change buttons masks so that there are masks for max and desktop buttons when their state changes but not for all buttons just when they are pressed --- engines/openbox/obrender.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'engines/openbox/obrender.c') diff --git a/engines/openbox/obrender.c b/engines/openbox/obrender.c index a9ed1e39..f63d61f4 100644 --- a/engines/openbox/obrender.c +++ b/engines/openbox/obrender.c @@ -27,12 +27,14 @@ void obrender_frame(ObFrame *self) l = (client_focused(self->frame.client) ? self->a_focused_label : self->a_unfocused_label); m = (client_focused(self->frame.client) ? - ((self->max_press || - self->frame.client->max_vert || self->frame.client->max_horz) ? - ob_a_focused_pressed_max : ob_a_focused_unpressed_max) : - ((self->max_press || - self->frame.client->max_vert || self->frame.client->max_horz) ? - ob_a_unfocused_pressed_max : ob_a_unfocused_unpressed_max)); + (self->frame.client->max_vert || self->frame.client->max_horz ? + ob_a_focused_pressed_set_max : + (self->max_press ? + ob_a_focused_pressed_max : ob_a_focused_unpressed_max)) : + (self->frame.client->max_vert || self->frame.client->max_horz ? + ob_a_unfocused_pressed_set_max : + (self->max_press ? + ob_a_unfocused_pressed_max : ob_a_unfocused_unpressed_max))); n = self->a_icon; i = (client_focused(self->frame.client) ? (self->iconify_press ? @@ -41,10 +43,14 @@ void obrender_frame(ObFrame *self) ob_a_unfocused_pressed_iconify : ob_a_unfocused_unpressed_iconify)); d = (client_focused(self->frame.client) ? - (self->desk_press || self->frame.client->desktop == DESKTOP_ALL ? - ob_a_focused_pressed_desk : ob_a_focused_unpressed_desk) : - (self->desk_press || self->frame.client->desktop == DESKTOP_ALL ? - ob_a_unfocused_pressed_desk : ob_a_unfocused_unpressed_desk)); + (self->frame.client->desktop == DESKTOP_ALL ? + ob_a_focused_pressed_set_desk : + (self->desk_press ? + ob_a_focused_pressed_desk : ob_a_focused_unpressed_desk)) : + (self->frame.client->desktop == DESKTOP_ALL ? + ob_a_unfocused_pressed_set_desk : + (self->desk_press ? + ob_a_unfocused_pressed_desk : ob_a_unfocused_unpressed_desk))); c = (client_focused(self->frame.client) ? (self->close_press ? ob_a_focused_pressed_close : ob_a_focused_unpressed_close) : -- cgit v1.2.3