|
1 Use the Solaris logo and allow it to be displayed on non-default backgrounds |
|
2 Not suitable for upstream |
|
3 |
|
4 --- a/schemas/org.fedorahosted.background-logo-extension.gschema.xml |
|
5 +++ b/schemas/org.fedorahosted.background-logo-extension.gschema.xml |
|
6 @@ -10,7 +10,7 @@ |
|
7 <schema path="/org/fedorahosted/background-logo-extension/" |
|
8 id="org.fedorahosted.background-logo-extension"> |
|
9 <key type="s" name="logo-file"> |
|
10 - <default>'/usr/share/pixmaps/fedora_whitelogo.svg'</default> |
|
11 + <default>'/usr/share/pixmaps/Oracle_Solaris_Logo.png'</default> |
|
12 <summary>Logo file</summary> |
|
13 <description>The full logo file path</description> |
|
14 </key> |
|
15 @@ -25,7 +25,7 @@ |
|
16 </key> |
|
17 <key type="d" name="logo-size"> |
|
18 - <range min="5.0" max="15.0"/> |
|
19 - <default>9.0</default> |
|
20 + <range min="5.0" max="25.0"/> |
|
21 + <default>15.0</default> |
|
22 <summary>Logo size</summary> |
|
23 <description>The logo size in percent relative to the screen width</description> |
|
24 </key> |
|
25 |
|
26 --- a/extension.js |
|
27 +++ b/extension.js |
|
28 @@ -141,14 +141,15 @@ const BackgroundLogo = new Lang.Class({ |
|
29 let defaultUri = background._settings.get_default_value('picture-uri'); |
|
30 let file = Gio.File.new_for_commandline_arg(defaultUri.deep_unpack()); |
|
31 |
|
32 - let visible; |
|
33 + let visible = true; |
|
34 +/* |
|
35 if (background._file) // > 3.14 |
|
36 visible = background._file.equal(file); |
|
37 else if (background._filename) // <= 3.14 |
|
38 visible = background._filename == file.get_path(); |
|
39 else // background == NONE |
|
40 visible = false; |
|
41 - |
|
42 + */ |
|
43 Tweener.addTween(this.actor, |
|
44 { opacity: visible ? 255 : 0, |
|
45 time: Background.FADE_ANIMATION_TIME, |