dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: use gimp_cairo_rounded_rectangle() in GimpOverlayFrame 

... instead of drawing it the hard way.
This commit is contained in:
Ell 2018-03-07 09:21:08 -05:00
parent 2c6ee43e84
commit e4c79cb2d6
2 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/core/gimp-cairo.c
View File

@ -151,6 +151,13 @@ gimp_cairo_rounded_rectangle (cairo_t *cr,
corner_radius = CLAMP (corner_radius, 0.0, MIN (width, height) / 2.0);
if (corner_radius == 0.0)
{
cairo_rectangle (cr, x, y, width, height);
return;
}
cairo_new_sub_path (cr);
cairo_arc (cr,

47
app/widgets/gimpoverlayframe.c
View File

@ -26,6 +26,8 @@
#include "widgets-types.h"
#include "core/gimp-cairo.h"
#include "gimpoverlayframe.h"
#include "gimpwidgets-utils.h"
@ -134,47 +136,12 @@ gimp_overlay_frame_expose (GtkWidget *widget,
gtk_widget_get_allocation (widget, &allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
if (rgba && border_width > 0)
if (rgba)
{
#define DEG_TO_RAD(deg) ((deg) * (G_PI / 180.0))
cairo_arc (cr,
border_width,
border_width,
border_width,
DEG_TO_RAD (180),
DEG_TO_RAD (270));
cairo_line_to (cr,
allocation.width - border_width,
0);
cairo_arc (cr,
allocation.width - border_width,
border_width,
border_width,
DEG_TO_RAD (270),
DEG_TO_RAD (0));
cairo_line_to (cr,
allocation.width,
allocation.height - border_width);
cairo_arc (cr,
allocation.width - border_width,
allocation.height - border_width,
border_width,
DEG_TO_RAD (0),
DEG_TO_RAD (90));
cairo_line_to (cr,
border_width,
allocation.height);
cairo_arc (cr,
border_width,
allocation.height - border_width,
border_width,
DEG_TO_RAD (90),
DEG_TO_RAD (180));
cairo_close_path (cr);
gimp_cairo_rounded_rectangle (cr,
0.0, 0.0,
allocation.width, allocation.height,
border_width);
}
else
{