summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-22 11:12:24 -0400
committerVictor Kareh <[email protected]>2019-06-05 10:49:37 -0400
commitb925581e37b2ac2ffdb97469fbfb284aac93feab (patch)
tree0f6cbd63cb8c07feff5123ff2a362b865c96cdaf /src/ui
parente8e9fca2142503b2bbbdb429f45742038e862413 (diff)
downloadmarco-b925581e37b2ac2ffdb97469fbfb284aac93feab.tar.bz2
marco-b925581e37b2ac2ffdb97469fbfb284aac93feab.tar.xz
frame: Add "get_corner_radiuses" chain
https://bugzilla.gnome.org/show_bug.cgi?id=628195 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/3994d7a0
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/frames.c34
-rw-r--r--src/ui/frames.h8
-rw-r--r--src/ui/ui.c13
3 files changed, 55 insertions, 0 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 9c3f3296..1af79765 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -806,6 +806,40 @@ meta_frames_get_borders (MetaFrames *frames,
borders->visible.right *= scale;
}
+void
+meta_frames_get_corner_radiuses (MetaFrames *frames,
+ Window xwindow,
+ float *top_left,
+ float *top_right,
+ float *bottom_left,
+ float *bottom_right)
+{
+ MetaUIFrame *frame;
+ MetaFrameGeometry fgeom;
+
+ frame = meta_frames_lookup_window (frames, xwindow);
+
+ meta_frames_calc_geometry (frames, frame, &fgeom);
+
+ /* For compatibility with the code in get_visible_rect(), there's
+ * a mysterious sqrt() added to the corner radiuses:
+ *
+ * const float radius = sqrt(corner) + corner;
+ *
+ * It's unclear why the radius is calculated like this, but we
+ * need to be consistent with it.
+ */
+
+ if (top_left)
+ *top_left = fgeom.top_left_corner_rounded_radius + sqrt(fgeom.top_left_corner_rounded_radius);
+ if (top_right)
+ *top_right = fgeom.top_right_corner_rounded_radius + sqrt(fgeom.top_right_corner_rounded_radius);
+ if (bottom_left)
+ *bottom_left = fgeom.bottom_left_corner_rounded_radius + sqrt(fgeom.bottom_left_corner_rounded_radius);
+ if (bottom_right)
+ *bottom_right = fgeom.bottom_right_corner_rounded_radius + sqrt(fgeom.bottom_right_corner_rounded_radius);
+}
+
#ifdef HAVE_SHAPE
static void
apply_cairo_region_to_window (Display *display,
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 0af5ed89..cde51e60 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -144,6 +144,14 @@ cairo_region_t *meta_frames_get_frame_bounds (MetaFrames *frames,
Window xwindow,
int window_width,
int window_height);
+
+void meta_frames_get_corner_radiuses (MetaFrames *frames,
+ Window xwindow,
+ float *top_left,
+ float *top_right,
+ float *bottom_left,
+ float *bottom_right);
+
void meta_frames_move_resize_frame (MetaFrames *frames,
Window xwindow,
int x,
diff --git a/src/ui/ui.c b/src/ui/ui.c
index a7058066..c805869f 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -302,6 +302,19 @@ meta_ui_get_frame_borders (MetaUI *ui,
meta_frames_get_borders (ui->frames, frame_xwindow, borders);
}
+void
+meta_ui_get_corner_radiuses (MetaUI *ui,
+ Window xwindow,
+ float *top_left,
+ float *top_right,
+ float *bottom_left,
+ float *bottom_right)
+{
+ meta_frames_get_corner_radiuses (ui->frames, xwindow,
+ top_left, top_right,
+ bottom_left, bottom_right);
+}
+
static void
set_background_none (Display *xdisplay,
Window xwindow)