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

tests: Fix scrolling in border.js and border-radius.js

Browse Source 
In both tests the scrolled actor's width was fixed to the stage
width, so that the scroll bars ended up outside the visible area.

Fix by adding an outer container with a fixed width and expanding
the scroll view to fill the available area.
This commit is contained in:
Florian Müllner 2010-12-09 13:20:09 +01:00
parent 7eec8a899a
commit e3aab2a90f
2 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/interactive/border-radius.js
View File

@ -10,15 +10,18 @@ let stage = Clutter.Stage.get_default();
stage.width = 640; stage.width = 640;
stage.height = 480; stage.height = 480;
let vbox = new St.BoxLayout({ vertical: true, let vbox = new St.BoxLayout({ width: stage.width,
width: stage.width,
height: stage.height, height: stage.height,
style: 'padding: 10px;' style: 'background: #ffee88;' });
+ 'spacing: 20px;' stage.add_actor(vbox);
+ 'background: #ffee88;' });
let scroll = new St.ScrollView(); let scroll = new St.ScrollView();
scroll.add_actor(vbox); vbox.add(scroll, { expand: true });
stage.add_actor(scroll);
let box = new St.BoxLayout({ vertical: true,
style: 'padding: 10px;'
+ 'spacing: 20px;' });
scroll.add_actor(box);
function addTestCase(radii, useGradient) { function addTestCase(radii, useGradient) {
let background; let background;
@ -29,7 +32,7 @@ function addTestCase(radii, useGradient) {
else else
background = 'background: white;'; background = 'background: white;';
vbox.add(new St.Label({ text: "border-radius: " + radii + ";", box.add(new St.Label({ text: "border-radius: " + radii + ";",
style: 'border: 1px solid black; ' style: 'border: 1px solid black; '
+ 'border-radius: ' + radii + ';' + 'border-radius: ' + radii + ';'
+ 'padding: 5px;' + background }), + 'padding: 5px;' + background }),

39
tests/interactive/borders.js
View File

@ -10,61 +10,64 @@ let stage = Clutter.Stage.get_default();
stage.width = 640; stage.width = 640;
stage.height = 480; stage.height = 480;
let vbox = new St.BoxLayout({ vertical: true, let vbox = new St.BoxLayout({ width: stage.width,
width: stage.width,
height: stage.height, height: stage.height,
style: 'padding: 10px;' style: 'background: #ffee88;' });
+ 'spacing: 20px;' stage.add_actor(vbox);
+ 'background: #ffee88;' });
let scroll = new St.ScrollView();
scroll.add_actor(vbox);
stage.add_actor(scroll);
vbox.add(new St.Label({ text: "Hello World", let scroll = new St.ScrollView();
vbox.add(scroll, { expand: true });
let box = new St.BoxLayout({ vertical: true,
style: 'padding: 10px;'
+ 'spacing: 20px;' });
scroll.add_actor(box);
box.add(new St.Label({ text: "Hello World",
style: 'border: 1px solid black; ' style: 'border: 1px solid black; '
+ 'padding: 5px;' })); + 'padding: 5px;' }));
vbox.add(new St.Label({ text: "Hello Round World", box.add(new St.Label({ text: "Hello Round World",
style: 'border: 3px solid green; ' style: 'border: 3px solid green; '
+ 'border-radius: 8px; ' + 'border-radius: 8px; '
+ 'padding: 5px;' })); + 'padding: 5px;' }));
vbox.add(new St.Label({ text: "Hello Background", box.add(new St.Label({ text: "Hello Background",
style: 'border: 3px solid green; ' style: 'border: 3px solid green; '
+ 'border-radius: 8px; ' + 'border-radius: 8px; '
+ 'background: white; ' + 'background: white; '
+ 'padding: 5px;' })); + 'padding: 5px;' }));
vbox.add(new St.Label({ text: "Hello Translucent Black Border", box.add(new St.Label({ text: "Hello Translucent Black Border",
style: 'border: 3px solid rgba(0, 0, 0, 0.4); ' style: 'border: 3px solid rgba(0, 0, 0, 0.4); '
+ 'background: white; ' })); + 'background: white; ' }));
vbox.add(new St.Label({ text: "Hello Translucent Background", box.add(new St.Label({ text: "Hello Translucent Background",
style: 'background: rgba(255, 255, 255, 0.3);' })); style: 'background: rgba(255, 255, 255, 0.3);' }));
vbox.add(new St.Label({ text: "Border, Padding, Content: 20px" })); box.add(new St.Label({ text: "Border, Padding, Content: 20px" }));
let b1 = new St.BoxLayout({ vertical: true, let b1 = new St.BoxLayout({ vertical: true,
style: 'border: 20px solid black; ' style: 'border: 20px solid black; '
+ 'background: white; ' + 'background: white; '
+ 'padding: 20px;' }); + 'padding: 20px;' });
vbox.add(b1); box.add(b1);
b1.add(new St.BoxLayout({ width: 20, height: 20, b1.add(new St.BoxLayout({ width: 20, height: 20,
style: 'background: black' })); style: 'background: black' }));
vbox.add(new St.Label({ text: "Translucent big blue border, with rounding", box.add(new St.Label({ text: "Translucent big blue border, with rounding",
style: 'border: 20px solid rgba(0, 0, 255, 0.2); ' style: 'border: 20px solid rgba(0, 0, 255, 0.2); '
+ 'border-radius: 10px; ' + 'border-radius: 10px; '
+ 'background: white; ' + 'background: white; '
+ 'padding: 10px;' })); + 'padding: 10px;' }));
vbox.add(new St.Label({ text: "Transparent border", box.add(new St.Label({ text: "Transparent border",
style: 'border: 20px solid transparent; ' style: 'border: 20px solid transparent; '
+ 'background: white; ' + 'background: white; '
+ 'padding: 10px;' })); + 'padding: 10px;' }));
vbox.add(new St.Label({ text: "Border Image", box.add(new St.Label({ text: "Border Image",
style_class: "border-image", style_class: "border-image",
style: "padding: 10px;" })); style: "padding: 10px;" }));