[metacity/wip/gtk-theme: 20/52] MetaWindow: Repurpose get_outer_rect and add get_input_rect
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity/wip/gtk-theme: 20/52] MetaWindow: Repurpose get_outer_rect and add get_input_rect
- Date: Wed, 7 Jan 2015 12:36:06 +0000 (UTC)
commit a9ffba46a1de972344a812b44cab9010086a198e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jun 29 13:37:04 2011 -0400
MetaWindow: Repurpose get_outer_rect and add get_input_rect
get_outer_rect now returns the visible region, and a new get_input_rect
method returns the boundaries of the full frame, including the possible
invisible regions. When undecorated, both do the samething.
https://bugzilla.gnome.org/show_bug.cgi?id=644930
NOTE: Both will return same region until Metacity will implement
invisible borders.
src/core/window-private.h | 2 ++
src/core/window.c | 40 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 2eb8ae6..91a6257 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -519,6 +519,8 @@ void meta_window_get_geometry (MetaWindow *window,
int *y,
int *width,
int *height);
+void meta_window_get_input_rect (const MetaWindow *window,
+ MetaRectangle *rect);
void meta_window_get_outer_rect (const MetaWindow *window,
MetaRectangle *rect);
void meta_window_get_xor_rect (MetaWindow *window,
diff --git a/src/core/window.c b/src/core/window.c
index 1682d70..75d23b3 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4014,13 +4014,51 @@ meta_window_get_geometry (MetaWindow *window,
window->size_hints.height_inc;
}
+/**
+ * meta_window_get_input_rect:
+ * @window: a #MetaWindow
+ * @rect: (out): pointer to an allocated #MetaRectangle
+ *
+ * Gets the rectangle that bounds @window that is responsive to mouse events.
+ * This includes decorations - the visible portion of its border - and (if
+ * present) any invisible area that we make make responsive to mouse clicks in
+ * order to allow convenient border dragging.
+ */
void
-meta_window_get_outer_rect (const MetaWindow *window,
+meta_window_get_input_rect (const MetaWindow *window,
MetaRectangle *rect)
{
if (window->frame)
*rect = window->frame->rect;
else
+ *rect = window->rect;
+}
+
+/**
+ * meta_window_get_outer_rect:
+ * @window: a #MetaWindow
+ * @rect: (out): pointer to an allocated #MetaRectangle
+ *
+ * Gets the rectangle that bounds @window that is responsive to mouse events.
+ * This includes only what is visible; it doesn't include any extra reactive
+ * area we add to the edges of windows.
+ */
+void
+meta_window_get_outer_rect (const MetaWindow *window,
+ MetaRectangle *rect)
+{
+ if (window->frame)
+ {
+ MetaFrameBorders borders;
+ *rect = window->frame->rect;
+ meta_frame_calc_borders (window->frame, &borders);
+
+ rect->x += borders.invisible.left;
+ rect->y += borders.invisible.top;
+ rect->width -= borders.invisible.left + borders.invisible.right;
+ rect->height -= borders.invisible.top + borders.invisible.bottom;
+ }
+ else
{
*rect = window->rect;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]