Commit c39efe0d5a770fa73382235b02a2f4825cb69251

  • avatar
  • flare576
  • Tue Oct 06 05:30:34 CEST 2009
Improved spacing over existing solution.
Compatible with WebOS v1.2.1
luna/more_icons_per_row_5x4-1.2.x.patch
(83 / 0)
  
15X4 Launcher page for webOS 1.2.1
2Index: /usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
3===================================================================
4--- .orig/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
5+++ /usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
6@@ -10,7 +10,7 @@ var LauncherAssistant = Class.create({
7 */
8 kQuickLaunchHeight: 67,
9
10- kPageIndicatorSpacing: 6, /* spacing between each page indicator */
11+ kPageIndicatorSpacing: 1, /* spacing between each page indicator */
12 kPageMargin: 10, /* 10 pixel margin on each side of a page */
13 kPageWidthNoMargin: NaN,
14 kPageWidth: NaN,
15@@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({
16 var newAppDiv = $(newAppInfo.launchPointId);
17 Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
18 if (isNaN(this.kAppWidth) || isNaN(this.kAppHeight)) {
19- this.kAppWidth = newAppDiv.getWidth();
20- this.kAppHeight = newAppDiv.getHeight();
21- this.kAppsPerRow = Math.round(this.kPageWidthNoMargin / this.kAppWidth);
22+ this.kAppWidth = 64;
23+ this.kAppHeight = 85;
24+ this.kAppsPerRow = 5;
25 }
26
27 Mojo.listen(newAppDiv, Mojo.Event.tap, this.onAppTapped.bindAsEventListener(this));
28@@ -439,7 +439,7 @@ var LauncherAssistant = Class.create({
29 /* determines the position of an app element at appIndex within a page */
30 calculateAppPosition: function(appIndex) {
31 return {
32- left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) + this.kPageMargin),
33+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) - 18),
34 top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
35 };
36 },
37Index: /usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
38===================================================================
39--- .orig/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
40+++ /usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
41@@ -121,8 +121,9 @@ body.palm-default
42
43 .launcher_page .name {
44 position:absolute;
45- top: 68px;
46- width:100px;
47+ top: 48px;
48+ left:20px;
49+ width:65px;
50 height: 34px;
51 max-height: 34px;
52 clear:both;
53@@ -130,7 +131,7 @@ body.palm-default
54 color:white;
55 text-align:center;
56 font-weight:bold;
57- font-size: 14px;
58+ font-size: 12px;
59 overflow: hidden;
60 text-overflow: ellipsis;
61 z-index:5;
62@@ -164,8 +165,8 @@ body.palm-default
63 }
64
65 .draggable {
66- width:64px;
67- height:64px;
68+ width:48px;
69+ height:48px;
70 margin: 0 auto;
71 -webkit-user-drag: any;
72 -webkit-user-select: none;
73@@ -213,8 +214,8 @@ body.palm-default
74
75 #app-icon {
76 float:left;
77- width:64px;
78- height:64px;
79+ width:32px;
80+ height:32px;
81 background: center center no-repeat;
82 }
83