isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boxpointer: Clean up

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=680077
This commit is contained in:
Debarshi Ray 2012-09-06 20:59:58 +02:00
parent 00f15c1075
commit 10da35cbef
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/boxpointer.js
View File

@ -327,7 +327,6 @@ const BoxPointer = new Lang.Class({
} }
if (!skipTopRight) { if (!skipTopRight) {
// top-right corner
cr.lineTo(x2 - borderRadius, y1); cr.lineTo(x2 - borderRadius, y1);
cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius, cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
3*Math.PI/2, Math.PI*2); 3*Math.PI/2, Math.PI*2);
@ -349,7 +348,6 @@ const BoxPointer = new Lang.Class({
} }
if (!skipBottomRight) { if (!skipBottomRight) {
// bottom-right corner
cr.lineTo(x2, y2 - borderRadius); cr.lineTo(x2, y2 - borderRadius);
cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius, cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
0, Math.PI/2); 0, Math.PI/2);
@ -371,7 +369,6 @@ const BoxPointer = new Lang.Class({
} }
if (!skipBottomLeft) { if (!skipBottomLeft) {
// bottom-left corner
cr.lineTo(x1 + borderRadius, y2); cr.lineTo(x1 + borderRadius, y2);
cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius, cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
Math.PI/2, Math.PI); Math.PI/2, Math.PI);
@ -393,7 +390,6 @@ const BoxPointer = new Lang.Class({
} }
if (!skipTopLeft) { if (!skipTopLeft) {
// top-left corner
cr.lineTo(x1, y1 + borderRadius); cr.lineTo(x1, y1 + borderRadius);
cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius, cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
Math.PI, 3*Math.PI/2); Math.PI, 3*Math.PI/2);
@ -451,7 +447,6 @@ const BoxPointer = new Lang.Class({
let borderRadius = themeNode.get_length('-arrow-border-radius'); let borderRadius = themeNode.get_length('-arrow-border-radius');
let margin = (4 * borderRadius + borderWidth + arrowBase); let margin = (4 * borderRadius + borderWidth + arrowBase);
let halfMargin = margin / 2;
let gap = themeNode.get_length('-boxpointer-gap'); let gap = themeNode.get_length('-boxpointer-gap');
let padding = themeNode.get_length('-arrow-rise'); let padding = themeNode.get_length('-arrow-rise');
@ -486,6 +481,7 @@ const BoxPointer = new Lang.Class({
let arrowOrigin; let arrowOrigin;
let halfBase = Math.floor(arrowBase/2); let halfBase = Math.floor(arrowBase/2);
let halfBorder = borderWidth / 2; let halfBorder = borderWidth / 2;
let halfMargin = margin / 2;
let [x1, y1] = [halfBorder, halfBorder]; let [x1, y1] = [halfBorder, halfBorder];
let [x2, y2] = [natWidth - halfBorder, natHeight - halfBorder]; let [x2, y2] = [natWidth - halfBorder, natHeight - halfBorder];