Commit f855a344efd544d7e0fa6c6308b9009aa46cd5c7

  • avatar
  • egaudet
  • Wed Sep 30 03:18:19 CEST 2009
Added updated 4x4 patch from PuffTheMagic
luna/more_icons_per_row_4x4-1.2.patch
(19 / 46)
  
114X4 Launcher page for webOS 1.2.0
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
2diff --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
3index 4da3e85..48fc720 100644
4--- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
5+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
66@@ -10,7 +10,7 @@ var LauncherAssistant = Class.create({
77 */
88 kQuickLaunchHeight: 67,
……
1212 kPageMargin: 10, /* 10 pixel margin on each side of a page */
1313 kPageWidthNoMargin: NaN,
1414 kPageWidth: NaN,
15@@ -23,8 +23,8 @@ var LauncherAssistant = Class.create({
16 visible: true,
17 label: $L('Launcher'),
18 items: [
19- /*{ label: $L('New page'), command: 'newpage' },
20- { label: $L('Delete page'), command: 'deletepage' },*/
21+ { label: $L('New page'), command: 'newpage' },
22+ { label: $L('Delete page'), command: 'deletepage' },
23 Mojo.Menu.editItem,
24 { label: $L('List Apps...'), command: 'listapps' },
25 Mojo.Menu.helpItem
26@@ -117,7 +117,7 @@ var LauncherAssistant = Class.create({
27 case 'listapps':
28 ApplicationService.launch(this.deviceInfo.id, this.deviceInfo.params);
29 break;
30- /*
31+
32 case 'newpage':
33 if (this.pageDivs.length < 10) {
34 this.insertPage(this.activePageIndex, true);
35@@ -131,7 +131,7 @@ var LauncherAssistant = Class.create({
36 }
37 }
38 break;
39- */
40+
41 }
42 }
43 else if (event.type === Mojo.Event.commandEnable) {
4415@@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({
4516 var newAppDiv = $(newAppInfo.launchPointId);
4617 Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
……
1919- this.kAppWidth = newAppDiv.getWidth();
2020- this.kAppHeight = newAppDiv.getHeight();
2121- this.kAppsPerRow = Math.round(this.kPageWidthNoMargin / this.kAppWidth);
22+ this.kAppWidth = 72;
23+ this.kAppHeight = 90;
22+ this.kAppWidth = 80;
23+ this.kAppHeight = 85;
2424+ this.kAppsPerRow = 4;
2525 }
2626
……
3030 calculateAppPosition: function(appIndex) {
3131 return {
3232- left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) + this.kPageMargin),
33+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth)),
33+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) - 10),
3434 top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
3535 };
3636 },
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,7 +121,7 @@ body.palm-default
37diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
38index b1244af..61ea830 100644
39--- a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
40+++ b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
41@@ -121,8 +121,9 @@ body.palm-default
4242
4343 .launcher_page .name {
4444 position:absolute;
4545- top: 68px;
46- width:100px;
4647+ top: 48px;
47 width:100px;
48+ left:9px;
49+ width:80px;
4850 height: 34px;
4951 max-height: 34px;
50@@ -130,7 +130,7 @@ body.palm-default
52 clear:both;
53@@ -130,7 +131,7 @@ body.palm-default
5154 color:white;
5255 text-align:center;
5356 font-weight:bold;
……
5959 overflow: hidden;
6060 text-overflow: ellipsis;
6161 z-index:5;
62@@ -164,8 +164,8 @@ body.palm-default
62@@ -164,8 +165,8 @@ body.palm-default
6363 }
6464
6565 .draggable {
……
7070 margin: 0 auto;
7171 -webkit-user-drag: any;
7272 -webkit-user-select: none;
73@@ -213,8 +213,8 @@ body.palm-default
73@@ -213,8 +214,8 @@ body.palm-default
7474
7575 #app-icon {
7676 float:left;
……
8080+ height:32px;
8181 background: center center no-repeat;
8282 }
83