mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toytoolkit: Don't draw shadows for maximized windows.

Browse Source 
Add THEME_FRAME_MAXIMIZED flag so the theming system can know not to draw
shadows for maximized windows. This allows maximized surfaces' content to be
sized and placed in a more expectable fashion.
dev
Scott Moreau 12 years ago committed by Kristian Høgsberg
parent c37b32dac2
commit c6a7e4b277
4 changed files with 88 additions and 49 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 75
      clients/window.c
  2. 41
      shared/cairo-util.c
  3. 7
      shared/cairo-util.h
  4. 4
      src/xwayland/window-manager.c

75
clients/window.c
Unescape View File

@ -1382,9 +1382,37 @@ frame_resize_handler(struct widget *widget,
struct theme *t = display->theme; struct theme *t = display->theme;
int x_l, x_r, y, w, h; int x_l, x_r, y, w, h;
int decoration_width, decoration_height; int decoration_width, decoration_height;
int opaque_margin; int opaque_margin, shadow_margin;
if (widget->window->type != TYPE_FULLSCREEN) { switch (widget->window->type) {
case TYPE_FULLSCREEN:
decoration_width = 0;
decoration_height = 0;
allocation.x = 0;
allocation.y = 0;
allocation.width = width;
allocation.height = height;
opaque_margin = 0;
wl_list_for_each(button, &frame->buttons_list, link)
button->widget->opaque = 1;
break;
case TYPE_MAXIMIZED:
decoration_width = t->width * 2;
decoration_height = t->width + t->titlebar_height;
allocation.x = t->width;
allocation.y = t->titlebar_height;
allocation.width = width - decoration_width;
allocation.height = height - decoration_height;
opaque_margin = 0;
wl_list_for_each(button, &frame->buttons_list, link)
button->widget->opaque = 0;
break;
default:
decoration_width = (t->width + t->margin) * 2; decoration_width = (t->width + t->margin) * 2;
decoration_height = t->width + decoration_height = t->width +
t->titlebar_height + t->margin * 2; t->titlebar_height + t->margin * 2;
@ -1398,18 +1426,7 @@ frame_resize_handler(struct widget *widget,
wl_list_for_each(button, &frame->buttons_list, link) wl_list_for_each(button, &frame->buttons_list, link)
button->widget->opaque = 0; button->widget->opaque = 0;
} else { break;
decoration_width = 0;
decoration_height = 0;
allocation.x = 0;
allocation.y = 0;
allocation.width = width;
allocation.height = height;
opaque_margin = 0;
wl_list_for_each(button, &frame->buttons_list, link)
button->widget->opaque = 1;
} }
widget_set_allocation(child, allocation.x, allocation.y, widget_set_allocation(child, allocation.x, allocation.y,
@ -1424,13 +1441,15 @@ frame_resize_handler(struct widget *widget,
width = child->allocation.width + decoration_width; width = child->allocation.width + decoration_width;
height = child->allocation.height + decoration_height; height = child->allocation.height + decoration_height;
shadow_margin = widget->window->type == TYPE_MAXIMIZED ? 0 : t->margin;
if (widget->window->type != TYPE_FULLSCREEN) { if (widget->window->type != TYPE_FULLSCREEN) {
widget->window->input_region = widget->window->input_region =
wl_compositor_create_region(display->compositor); wl_compositor_create_region(display->compositor);
wl_region_add(widget->window->input_region, wl_region_add(widget->window->input_region,
t->margin, t->margin, shadow_margin, shadow_margin,
width - 2 * t->margin, width - 2 * shadow_margin,
height - 2 * t->margin); height - 2 * shadow_margin);
} }
widget_set_allocation(widget, 0, 0, width, height); widget_set_allocation(widget, 0, 0, width, height);
@ -1445,9 +1464,9 @@ frame_resize_handler(struct widget *widget,
} }
/* frame internal buttons */ /* frame internal buttons */
x_r = frame->widget->allocation.width - t->width - t->margin; x_r = frame->widget->allocation.width - t->width - shadow_margin;
x_l = t->width + t->margin; x_l = t->width + shadow_margin;
y = t->width + t->margin; y = t->width + shadow_margin;
wl_list_for_each(button, &frame->buttons_list, link) { wl_list_for_each(button, &frame->buttons_list, link) {
const int button_padding = 4; const int button_padding = 4;
w = cairo_image_surface_get_width(button->icon); w = cairo_image_surface_get_width(button->icon);
@ -1674,6 +1693,8 @@ frame_redraw_handler(struct widget *widget, void *data)
if (window->focus_count) if (window->focus_count)
flags |= THEME_FRAME_ACTIVE; flags |= THEME_FRAME_ACTIVE;
if (window->type == TYPE_MAXIMIZED)
flags |= THEME_FRAME_MAXIMIZED;
theme_render_frame(t, cr, widget->allocation.width, theme_render_frame(t, cr, widget->allocation.width,
widget->allocation.height, window->title, flags); widget->allocation.height, window->title, flags);
@ -1684,11 +1705,14 @@ static int
frame_get_pointer_image_for_location(struct frame *frame, struct input *input) frame_get_pointer_image_for_location(struct frame *frame, struct input *input)
{ {
struct theme *t = frame->widget->window->display->theme; struct theme *t = frame->widget->window->display->theme;
struct window *window = frame->widget->window;
int location; int location;
location = theme_get_location(t, input->sx, input->sy, location = theme_get_location(t, input->sx, input->sy,
frame->widget->allocation.width, frame->widget->allocation.width,
frame->widget->allocation.height); frame->widget->allocation.height,
window->type == TYPE_MAXIMIZED ?
THEME_FRAME_MAXIMIZED : 0);
switch (location) { switch (location) {
case THEME_LOCATION_RESIZING_TOP: case THEME_LOCATION_RESIZING_TOP:
@ -1795,7 +1819,9 @@ frame_button_handler(struct widget *widget,
location = theme_get_location(display->theme, input->sx, input->sy, location = theme_get_location(display->theme, input->sx, input->sy,
frame->widget->allocation.width, frame->widget->allocation.width,
frame->widget->allocation.height); frame->widget->allocation.height,
window->type == TYPE_MAXIMIZED ?
THEME_FRAME_MAXIMIZED : 0);
if (window->display->shell && button == BTN_LEFT && if (window->display->shell && button == BTN_LEFT &&
state == WL_POINTER_BUTTON_STATE_PRESSED) { state == WL_POINTER_BUTTON_STATE_PRESSED) {
@ -1885,11 +1911,12 @@ frame_set_child_size(struct widget *widget, int child_width, int child_height)
struct theme *t = display->theme; struct theme *t = display->theme;
int decoration_width, decoration_height; int decoration_width, decoration_height;
int width, height; int width, height;
int margin = widget->window->type == TYPE_MAXIMIZED ? 0 : t->margin;
if (widget->window->type != TYPE_FULLSCREEN) { if (widget->window->type != TYPE_FULLSCREEN) {
decoration_width = (t->width + t->margin) * 2; decoration_width = (t->width + margin) * 2;
decoration_height = t->width + decoration_height = t->width +
t->titlebar_height + t->margin * 2; t->titlebar_height + margin * 2;
width = child_width + decoration_width; width = child_width + decoration_width;
height = child_height + decoration_height; height = child_height + decoration_height;

41
shared/cairo-util.c
Unescape View File

@ -380,16 +380,21 @@ theme_render_frame(struct theme *t,
cairo_text_extents_t extents; cairo_text_extents_t extents;
cairo_font_extents_t font_extents; cairo_font_extents_t font_extents;
cairo_surface_t *source; cairo_surface_t *source;
int x, y; int x, y, margin;
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0, 0, 0, 0); cairo_set_source_rgba(cr, 0, 0, 0, 0);
cairo_paint(cr); cairo_paint(cr);
if (flags & THEME_FRAME_MAXIMIZED)
margin = 0;
else {
cairo_set_source_rgba(cr, 0, 0, 0, 0.45); cairo_set_source_rgba(cr, 0, 0, 0, 0.45);
tile_mask(cr, t->shadow, tile_mask(cr, t->shadow,
2, 2, width + 8, height + 8, 2, 2, width + 8, height + 8,
64, 64); 64, 64);
margin = t->margin;
}
if (flags & THEME_FRAME_ACTIVE) if (flags & THEME_FRAME_ACTIVE)
source = t->active_frame; source = t->active_frame;
@ -397,12 +402,12 @@ theme_render_frame(struct theme *t,
source = t->inactive_frame; source = t->inactive_frame;
tile_source(cr, source, tile_source(cr, source,
t->margin, t->margin, margin, margin,
width - t->margin * 2, height - t->margin * 2, width - margin * 2, height - margin * 2,
t->width, t->titlebar_height); t->width, t->titlebar_height);
cairo_rectangle (cr, t->margin + t->width, t->margin, cairo_rectangle (cr, margin + t->width, margin,
width - (t->margin + t->width) * 2, width - (margin + t->width) * 2,
t->titlebar_height - t->width); t->titlebar_height - t->width);
cairo_clip(cr); cairo_clip(cr);
@ -414,7 +419,7 @@ theme_render_frame(struct theme *t,
cairo_text_extents(cr, title, &extents); cairo_text_extents(cr, title, &extents);
cairo_font_extents (cr, &font_extents); cairo_font_extents (cr, &font_extents);
x = (width - extents.width) / 2; x = (width - extents.width) / 2;
y = t->margin + y = margin +
(t->titlebar_height - (t->titlebar_height -
font_extents.ascent - font_extents.descent) / 2 + font_extents.ascent - font_extents.descent) / 2 +
font_extents.ascent; font_extents.ascent;
@ -434,29 +439,33 @@ theme_render_frame(struct theme *t,
} }
enum theme_location enum theme_location
theme_get_location(struct theme *t, int x, int y, int width, int height) theme_get_location(struct theme *t, int x, int y,
int width, int height, int flags)
{ {
int vlocation, hlocation, location; int vlocation, hlocation, location;
const int grip_size = 8; const int grip_size = 8;
int margin;
margin = (flags & THEME_FRAME_MAXIMIZED) ? 0 : t->margin;
if (x < t->margin) if (x < margin)
hlocation = THEME_LOCATION_EXTERIOR; hlocation = THEME_LOCATION_EXTERIOR;
else if (t->margin <= x && x < t->margin + grip_size) else if (margin <= x && x < margin + grip_size)
hlocation = THEME_LOCATION_RESIZING_LEFT; hlocation = THEME_LOCATION_RESIZING_LEFT;
else if (x < width - t->margin - grip_size) else if (x < width - margin - grip_size)
hlocation = THEME_LOCATION_INTERIOR; hlocation = THEME_LOCATION_INTERIOR;
else if (x < width - t->margin) else if (x < width - margin)
hlocation = THEME_LOCATION_RESIZING_RIGHT; hlocation = THEME_LOCATION_RESIZING_RIGHT;
else else
hlocation = THEME_LOCATION_EXTERIOR; hlocation = THEME_LOCATION_EXTERIOR;
if (y < t->margin) if (y < margin)
vlocation = THEME_LOCATION_EXTERIOR; vlocation = THEME_LOCATION_EXTERIOR;
else if (t->margin <= y && y < t->margin + grip_size) else if (margin <= y && y < margin + grip_size)
vlocation = THEME_LOCATION_RESIZING_TOP; vlocation = THEME_LOCATION_RESIZING_TOP;
else if (y < height - t->margin - grip_size) else if (y < height - margin - grip_size)
vlocation = THEME_LOCATION_INTERIOR; vlocation = THEME_LOCATION_INTERIOR;
else if (y < height - t->margin) else if (y < height - margin)
vlocation = THEME_LOCATION_RESIZING_BOTTOM; vlocation = THEME_LOCATION_RESIZING_BOTTOM;
else else
vlocation = THEME_LOCATION_EXTERIOR; vlocation = THEME_LOCATION_EXTERIOR;
@ -465,7 +474,7 @@ theme_get_location(struct theme *t, int x, int y, int width, int height)
if (location & THEME_LOCATION_EXTERIOR) if (location & THEME_LOCATION_EXTERIOR)
location = THEME_LOCATION_EXTERIOR; location = THEME_LOCATION_EXTERIOR;
if (location == THEME_LOCATION_INTERIOR && if (location == THEME_LOCATION_INTERIOR &&
y < t->margin + t->titlebar_height) y < margin + t->titlebar_height)
location = THEME_LOCATION_TITLEBAR; location = THEME_LOCATION_TITLEBAR;
else if (location == THEME_LOCATION_INTERIOR) else if (location == THEME_LOCATION_INTERIOR)
location = THEME_LOCATION_CLIENT_AREA; location = THEME_LOCATION_CLIENT_AREA;

7
shared/cairo-util.h
Unescape View File

@ -58,7 +58,10 @@ theme_create(void);
void void
theme_destroy(struct theme *t); theme_destroy(struct theme *t);
#define THEME_FRAME_ACTIVE 1 enum {
THEME_FRAME_ACTIVE = 1,
THEME_FRAME_MAXIMIZED,
};
void void
theme_render_frame(struct theme *t, theme_render_frame(struct theme *t,
@ -82,6 +85,6 @@ enum theme_location {
}; };
enum theme_location enum theme_location
theme_get_location(struct theme *t, int x, int y, int width, int height); theme_get_location(struct theme *t, int x, int y, int width, int height, int flags);
#endif #endif

4
src/xwayland/window-manager.c
Unescape View File

@ -1034,7 +1034,7 @@ weston_wm_destroy_cursors(struct weston_wm *wm)
static int static int
get_cursor_for_location(struct theme *t, int width, int height, int x, int y) get_cursor_for_location(struct theme *t, int width, int height, int x, int y)
{ {
int location = theme_get_location(t, x, y, width, height); int location = theme_get_location(t, x, y, width, height, 0);
switch (location) { switch (location) {
case THEME_LOCATION_RESIZING_TOP: case THEME_LOCATION_RESIZING_TOP:
@ -1101,7 +1101,7 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
location = theme_get_location(t, location = theme_get_location(t,
button->event_x, button->event_x,
button->event_y, button->event_y,
width, height); width, height, 0);
switch (location) { switch (location) {
case THEME_LOCATION_TITLEBAR: case THEME_LOCATION_TITLEBAR:

Write Preview
Loading…
Cancel
Save