Commit f855a344efd544d7e0fa6c6308b9009aa46cd5c7

egaudet
Wed Sep 30 01:18:19 GMT 2009

Tree SHA1: f8c5d65
Parent SHA1: 86f0da3 (Add comment in header for Jack87)
raw diff | raw patch

Added updated 4x4 patch from PuffTheMagic

Diff rendering mode:
inline
side by side


1	1	4X4 Launcher page for webOS 1.2.0
2		Index: /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
	2	diff --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
	3	index 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
6	6	@@ -10,7 +10,7 @@ var LauncherAssistant = Class.create({
7	7	*/
8	8	kQuickLaunchHeight: 67,
…	…
12	12	kPageMargin: 10, /* 10 pixel margin on each side of a page */
13	13	kPageWidthNoMargin: NaN,
14	14	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) {
44	15	@@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({
45	16	var newAppDiv = $(newAppInfo.launchPointId);
46	17	Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
…	…
19	19	- this.kAppWidth = newAppDiv.getWidth();
20	20	- this.kAppHeight = newAppDiv.getHeight();
21	21	- this.kAppsPerRow = Math.round(this.kPageWidthNoMargin / this.kAppWidth);
22		+ this.kAppWidth = 72;
23		+ this.kAppHeight = 90;
	22	+ this.kAppWidth = 80;
	23	+ this.kAppHeight = 85;
24	24	+ this.kAppsPerRow = 4;
25	25	}
26	26
…	…
30	30	calculateAppPosition: function(appIndex) {
31	31	return {
32	32	- left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) + this.kPageMargin),
33		+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth)),
	33	+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) - 10),
34	34	top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
35	35	};
36	36	},
37		Index: /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
	37	diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
	38	index 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
42	42
43	43	.launcher_page .name {
44	44	position:absolute;
45	45	- top: 68px;
	46	- width:100px;
46	47	+ top: 48px;
47		width:100px;
	48	+ left:9px;
	49	+ width:80px;
48	50	height: 34px;
49	51	max-height: 34px;
50		@@ -130,7 +130,7 @@ body.palm-default
	52	clear:both;
	53	@@ -130,7 +131,7 @@ body.palm-default
51	54	color:white;
52	55	text-align:center;
53	56	font-weight:bold;
…	…
59	59	overflow: hidden;
60	60	text-overflow: ellipsis;
61	61	z-index:5;
62		@@ -164,8 +164,8 @@ body.palm-default
	62	@@ -164,8 +165,8 @@ body.palm-default
63	63	}
64	64
65	65	.draggable {
…	…
70	70	margin: 0 auto;
71	71	-webkit-user-drag: any;
72	72	-webkit-user-select: none;
73		@@ -213,8 +213,8 @@ body.palm-default
	73	@@ -213,8 +214,8 @@ body.palm-default
74	74
75	75	#app-icon {
76	76	float:left;
…	…
80	80	+ height:32px;
81	81	background: center center no-repeat;
82	82	}
83

Commit f855a344efd544d7e0fa6c6308b9009aa46cd5c7

Comments

Add a new comment:

Add your comment