[metacity/wip/invisible-borders: 6/25] 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/invisible-borders: 6/25] MetaWindow: Repurpose get_outer_rect and add get_input_rect
- Date: Tue, 20 Jan 2015 13:13:03 +0000 (UTC)
commit 68f80a3a9706aa071db2bc011508c3915325812e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Jan 18 16:26:07 2015 +0200
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
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 c76c09e..aa12e3c 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -523,6 +523,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 852e8f5..e7f34bf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4029,13 +4029,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]