brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjusted the rounded corners so that they fit nicely with the arcs around

Browse Source 
2007-03-20  Arthur Taylor  <theycallhimart@gmail.com>

        * src/frames.c (meta_frames_apply_shapes): adjusted the rounded
          corners so that they fit nicely with the arcs around them.
          Fixes #399373.
                                                                                                                                           

svn path=/trunk/; revision=3120
This commit is contained in:
Arthur Taylor 2007-03-21 02:22:10 +00:00 committed by Thomas James Alexander Thurman
parent 88b91199d2
commit 11a90c53ed
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-20 Arthur Taylor <theycallhimart@gmail.com>
* src/frames.c (meta_frames_apply_shapes): adjusted the rounded
corners so that they fit nicely with the arcs around them.
Fixes #399373.
2007-03-17 Kjartan Maraas <kmaraas@gnome.org> 2007-03-17 Kjartan Maraas <kmaraas@gnome.org>
* src/ui.c: Remove #include <pango/pangox.h> since it's * src/ui.c: Remove #include <pango/pangox.h> since it's

32
src/frames.c
View File

@ -788,12 +788,13 @@ meta_frames_apply_shapes (MetaFrames *frames,
if (fgeom.top_left_corner_rounded_radius != 0) if (fgeom.top_left_corner_rounded_radius != 0)
{ {
const int radius = fgeom.top_left_corner_rounded_radius; const int corner = fgeom.top_left_corner_rounded_radius;
const float radius = sqrt(corner) + corner;
int i; int i;
for (i=0; i<radius; i++) for (i=0; i<corner; i++)
{ {
const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5)); const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
xrect.x = 0; xrect.x = 0;
xrect.y = i; xrect.y = i;
xrect.width = width; xrect.width = width;
@ -805,12 +806,13 @@ meta_frames_apply_shapes (MetaFrames *frames,
if (fgeom.top_right_corner_rounded_radius != 0) if (fgeom.top_right_corner_rounded_radius != 0)
{ {
const int radius = fgeom.top_right_corner_rounded_radius; const int corner = fgeom.top_right_corner_rounded_radius;
const float radius = sqrt(corner) + corner;
int i; int i;
for (i=0; i<radius; i++) for (i=0; i<corner; i++)
{ {
const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5)); const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
xrect.x = new_window_width - width; xrect.x = new_window_width - width;
xrect.y = i; xrect.y = i;
xrect.width = width; xrect.width = width;
@ -822,14 +824,15 @@ meta_frames_apply_shapes (MetaFrames *frames,
if (fgeom.bottom_left_corner_rounded_radius != 0) if (fgeom.bottom_left_corner_rounded_radius != 0)
{ {
const int radius = fgeom.bottom_left_corner_rounded_radius; const int corner = fgeom.bottom_left_corner_rounded_radius;
const float radius = sqrt(corner) + corner;
int i; int i;
for (i=0; i<radius; i++) for (i=0; i<corner; i++)
{ {
const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5)); const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
xrect.x = 0; xrect.x = 0;
xrect.y = new_window_height - i; xrect.y = new_window_height - i - 1;
xrect.width = width; xrect.width = width;
xrect.height = 1; xrect.height = 1;
@ -839,14 +842,15 @@ meta_frames_apply_shapes (MetaFrames *frames,
if (fgeom.bottom_right_corner_rounded_radius != 0) if (fgeom.bottom_right_corner_rounded_radius != 0)
{ {
const int radius = fgeom.bottom_right_corner_rounded_radius; const int corner = fgeom.bottom_right_corner_rounded_radius;
const float radius = sqrt(corner) + corner;
int i; int i;
for (i=0; i<radius; i++) for (i=0; i<corner; i++)
{ {
const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5)); const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
xrect.x = new_window_width - width; xrect.x = new_window_width - width;
xrect.y = new_window_height - i; xrect.y = new_window_height - i - 1;
xrect.width = width; xrect.width = width;
xrect.height = 1; xrect.height = 1;