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