Commit 82a1814bb3da30ba1e64978cc3e5abf4f2c74cd9

  • avatar
  • Daniel Beames <dbeames @dbeames…ptop.(none)>
  • Tue Oct 13 08:02:29 CEST 2009
Added app-launcher-4x4-icons-v3
  
1diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
2index 4da3e85..a80735f 100644
3--- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
4+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
5@@ -10,8 +10,8 @@ var LauncherAssistant = Class.create({
6 */
7 kQuickLaunchHeight: 67,
8
9- kPageIndicatorSpacing: 6, /* spacing between each page indicator */
10- kPageMargin: 10, /* 10 pixel margin on each side of a page */
11+ kPageIndicatorSpacing: 1, /* spacing between each page indicator */
12+ kPageMargin: 0, /* 0 pixel margin on each side of a page */
13 kPageWidthNoMargin: NaN,
14 kPageWidth: NaN,
15 kAppsPerRow: NaN,
16@@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({
17 var newAppDiv = $(newAppInfo.launchPointId);
18 Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
19 if (isNaN(this.kAppWidth) || isNaN(this.kAppHeight)) {
20- this.kAppWidth = newAppDiv.getWidth();
21- this.kAppHeight = newAppDiv.getHeight();
22- this.kAppsPerRow = Math.round(this.kPageWidthNoMargin / this.kAppWidth);
23+ this.kAppWidth = 80;
24+ this.kAppHeight = 92;
25+ this.kAppsPerRow = 4;
26 }
27
28 Mojo.listen(newAppDiv, Mojo.Event.tap, this.onAppTapped.bindAsEventListener(this));
29@@ -439,8 +439,8 @@ var LauncherAssistant = Class.create({
30 /* determines the position of an app element at appIndex within a page */
31 calculateAppPosition: function(appIndex) {
32 return {
33- left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) + this.kPageMargin),
34- top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
35+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) - 10),
36+ top: ((Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight) - 8)
37 };
38 },
39
40diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
41index b1244af..0e7b97a 100644
42--- a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
43+++ b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
44@@ -121,16 +121,17 @@ body.palm-default
45
46 .launcher_page .name {
47 position:absolute;
48- top: 68px;
49- width:100px;
50- height: 34px;
51- max-height: 34px;
52+ top: 62px;
53+ left: 11px;
54+ width:78px;
55+ height: 28px;
56+ max-height: 28px;
57 clear:both;
58- line-height:16px;
59+ line-height:13px;
60 color:white;
61 text-align:center;
62 font-weight:bold;
63- font-size: 14px;
64+ font-size: 13px;
65 overflow: hidden;
66 text-overflow: ellipsis;
67 z-index:5;