[meego-commits] 5031: Changes to Trunk:Testing/fennec-qt
Roger WANG
roger.wang at intel.com
Wed Jun 30 05:12:35 UTC 2010
Hi,
I have made the following changes to fennec-qt in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Roger WANG
[This message was auto-generated]
---
Request #5031:
submit: home:wwang29:branches:Trunk/fennec-qt(r4) -> Trunk:Testing/fennec-qt
Message:
None
State: new 2010-06-29T17:09:07 wwang29
Comment: None
changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -1 +1,7 @@
-* Fri Jun 25 20:48:50 CST 2010 Roger WANG <roger.wang at intel.com> 2.0a1pre0531.1
+* Tue Jun 29 23:27:39 CST 2010 Roger WANG <roger.wang at intel.com> 2.0a1pre0531.2
+- fixing meego theme layout issues (BMC#3480, 3494)
+
+* Mon Jun 28 2010 Markus Lehtonen <markus.lehtonen at nokia.com> 2.0a1pre0531.1
+- ARM compilation fix (re-apply Marko Saukko's fixes)
+
+* Fri Jun 25 20:48:50 CST 2010 Roger WANG <roger.wang at intel.com> 2.0a1pre0531
new:
----
fennec-qt-nsFrame-visibility-hack.patch
spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -8,7 +8,7 @@
Name: fennec-qt
Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version: 2.0a1pre0531.1
+Version: 2.0a1pre0531.2
Release: 1
Group: Applications/Internet
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -24,6 +24,7 @@
Source100: fennec-qt.yaml
Patch0: meego-central.patch
Patch1: meego-mobile.patch
+Patch2: fennec-qt-nsFrame-visibility-hack.patch
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
@@ -73,6 +74,8 @@
%patch0 -p1
# meego-mobile.patch
%patch1 -p1
+# fennec-qt-nsFrame-visibility-hack.patch
+%patch2 -p1
# >> setup
cp %{SOURCE1} .mozconfig
cp -f %{SOURCE5} mobile/themes/hildon/images/
@@ -83,6 +86,11 @@
echo "mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}" >> .mozconfig
echo "export MOZ_MAKE_FLAGS=%{?_smp_mflags}" >> .mozconfig
+%ifarch %{arm}
+echo "ac_add_options --with-maemo-version=6" >> .mozconfig
+echo "ac_add_options --enable-cpp-exceptions" >> .mozconfig
+%endif
+
make -f client.mk build
# << build pre
other changes:
--------------
++++++ fennec-qt-nsFrame-visibility-hack.patch (new)
--- fennec-qt-nsFrame-visibility-hack.patch
+++ fennec-qt-nsFrame-visibility-hack.patch
+--- a/layout/generic/nsFrame.h.orig 2010-06-22 17:13:17.000000000 +0300
++++ b/layout/generic/nsFrame.h 2010-06-22 17:13:33.000000000 +0300
+@@ -151,7 +151,7 @@
+ // Left undefined; nsFrame objects are never allocated from the heap.
+ void* operator new(size_t sz) CPP_THROW_NEW;
+
+-protected:
++public:
+ // Overridden to prevent the global delete from being called, since
+ // the memory came out of an arena instead of the heap.
+ //
++++++ fennec-qt.yaml
--- fennec-qt.yaml
+++ fennec-qt.yaml
@@ -1,6 +1,6 @@
Name: fennec-qt
Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version: 2.0a1pre0531.1
+Version: 2.0a1pre0531.2
Release: 1
Group: Applications/Internet
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -17,6 +17,7 @@
Patches:
- meego-central.patch
- meego-mobile.patch
+ - fennec-qt-nsFrame-visibility-hack.patch
Description: Fennec is the code name of the effort to build a mobile version of Firefox.
PkgBR:
++++++ meego-mobile.patch
--- meego-mobile.patch
+++ meego-mobile.patch
@@ -54,7 +54,24 @@
diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
-@@ -1022,24 +1022,15 @@
+@@ -381,7 +381,7 @@
+ get toolbarH() {
+ if (!this._toolbarH) {
+ let toolbar = document.getElementById("toolbar-main");
+- this._toolbarH = toolbar.boxObject.height;
++ this._toolbarH = Math.round(toolbar.getBoundingClientRect().height);
+ }
+ return this._toolbarH;
+ },
+@@ -400,6 +400,7 @@
+ },
+
+ sizeControls : function(windowW, windowH) {
++ this._toolbarH = null;
+ // tabs
+ document.getElementById("tabs").resize();
+
+@@ -1022,24 +1023,15 @@
false);
}
++++++ meego-theme.tar.gz
--- content/browser-meego.xul
+++ content/browser-meego.xul
@@ -198,6 +198,7 @@
<toolbar id="toolbar-main" class="panel-dark window-width">
<toolbarbutton id="tool-home-screen" class="urlbar-button button-image" command="cmd_homescreen"/>
<hbox id="urlbar-container" flex="1">
+ <hbox id="urlbar-editarea" flex="1">
<box id="identity-box"
onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
@@ -206,7 +207,6 @@
<image id="urlbar-favicon" hidden="true"/>
</box>
</box>
- <hbox id="urlbar-editarea" flex="1">
<textbox id="urlbar-edit"
type="autocomplete"
autocompletesearch="history"
@@ -220,13 +220,13 @@
flex="1"
ontextentered="BrowserUI.goToURI();"
clickSelectsAll="true"/>
- </hbox>
<hbox id="urlbar-icons" mode="view">
<toolbarbutton id="tool-reload" class="urlbar-cap-button"
oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
<toolbarbutton id="tool-stop" class="urlbar-cap-button" command="cmd_stop"/>
<toolbarbutton id="tool-go" class="urlbar-cap-button" command="cmd_go"/>
</hbox>
+ </hbox>
</hbox>
<toolbarbutton id="tool-new-page" command="cmd_newTab" class="urlbar-button button-image"/>
<toolbarbutton id="tool-app-close" class="urlbar-button button-image" command="cmd_close"/>
@@ -282,7 +282,7 @@
</vbox>
<!-- popup for site identity information -->
- <vbox id="identity-container" hidden="true" class="panel-dark window-width" mode="unknownIdentity">
+ <vbox id="identity-container" hidden="true" class="panel-dark window-width" top="0" mode="unknownIdentity">
<hbox id="identity-popup-container" flex="1" align="top">
<image id="identity-popup-icon"/>
<vbox id="identity-popup-content-box" flex="1">
--- skin/browser.css
+++ skin/browser.css
@@ -65,12 +65,22 @@
}
#tool-app-switch {
- min-width: 64px !important;
+ margin-top: -8px; /* force the button to go to the edge */
+ margin-bottom: -8px; /* force the button to go to the edge */
+ margin-left: -8px; /* force the button to go to the edge */
+ padding-left: 8px !important; /* re-center the image */
+ min-width: 72px !important; /* 72, not 64 to make up for the negative margin */
+ min-height: 72px !important; /* 72, not 64 to make up for the negative margin */
visibility: collapse;
margin-right: 8px; /* core spacing */
list-style-image: url("chrome://browser/skin/images/task-switch-40.png");
}
+#tool-app-switch:hover:active {
+ background-color: #8db8d8 !important;
+ -moz-border-radius-bottomright: 6px;
+}
+
#toolbar-main[fullscreen="true"] #tool-app-switch:not(:-moz-system-metric(maemo-classic)) {
visibility: visible;
}
@@ -276,6 +286,14 @@
list-style-image: url("chrome://browser/skin/images/bookmark-active-64.png");
}
+#tool-homescreen {
+ list-style-image: url("chrome://browser/skin/images/home-64.png");
+}
+
+#tool-homescreen:hover:active {
+ list-style-image: url("chrome://browser/skin/images/home-64.png");
+}
+
#tool-star[starred="true"] {
list-style-image: url("chrome://browser/skin/images/bookmarked-default-64.png");
}
@@ -422,6 +440,10 @@
}
}
+.addon-image {
+ list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+}
+
.addon-rating[rating] {
width: 78px;
height: 18px;
@@ -507,10 +529,20 @@
/* bookmarks navigation popup ------------------------------ */
#tool-bookmarks-close {
- min-width: 64px !important;
+ margin-top: -8px; /* force the button to go to the edge */
+ margin-bottom: -8px; /* force the button to go to the edge */
+ margin-right: -8px; /* force the button to go to the edge */
+ padding-right: 8px !important; /* re-center the image */
+ min-width: 72px !important; /* 72, not 64 to make up for the negative margin */
+ min-height: 72px !important; /* 72, not 64 to make up for the negative margin */
list-style-image: url("chrome://browser/skin/images/task-back-40.png");
}
+#tool-bookmarks-close:hover:active {
+ background-color: #8db8d8 !important;
+ -moz-border-radius-bottomleft: 6px;
+}
+
#bookmarklist-container {
padding: 0;
}
@@ -570,6 +602,7 @@
placeitem[type="folder"] > .bookmark-item-label > image,
placeitem[type="folder"] > .bookmark-manage > image {
list-style-image: url(images/folder-32.png);
+ margin-top: 0;
}
placeitem[type="folder"] > .bookmark-item-label {
@@ -733,7 +766,8 @@
width: 32px;
height: 32px;
max-height: 32px;
- margin: 0 16px 0 8px;
+ /* margin-top = (1 - title's line-height) * title's font-size */
+ margin: 5px 16px 0 8px;
}
placeitem[src=""] .bookmark-item-label > image {
@@ -741,8 +775,8 @@
padding-top: 30px;
}
-.autocomplete-item-label > label,
-.bookmark-item-label > label {
+.autocomplete-item-label > vbox > label,
+.bookmark-item-label > vbox > label {
-moz-margin-start: 1px;
}
@@ -750,7 +784,7 @@
.autocomplete-item-label[favorite="true"] {
padding-right: 30px;
- background: url(images/star-24.png) no-repeat 98%;
+ background: url(images/star-24.png) no-repeat 100% 2px;
}
.autocomplete-item-label:not([tags=""]):after,
@@ -768,9 +802,7 @@
.bookmark-item-url {
color: #adadad;
font-size: 18px !important;
- margin-left: 24px;
margin-right: 24px;
- padding-left: 34px;
}
/* special "no results" and "all bookmarks" items */
--- skin/platform.css
+++ skin/platform.css
@@ -98,33 +98,78 @@
.dialog-dark {
color: #fff;
background-color: #2f2f2f;
- border: 3px solid #262629;
+ border-width: 4px 3px 4px 3px;
+ border-style: solid;
+ -moz-border-top-colors: black #4a4b4f;
+ -moz-border-left-colors: black #4a4b4f;
+ -moz-border-bottom-colors: black #4a4b4f;
+ -moz-border-right-colors: black #4a4b4f;
-moz-border-radius: 8px 8px 8px 8px;
- padding: 8px;
-moz-box-shadow: black 0 2px 2px;
+ padding: 8px;
}
/* prompt dialogs ---------------------------------------------------------- */
-dialog {
- font-size: 21px !important;
+.modal-block {
+ padding: 64px;
}
-dialog .prompt-message {
+.modal-block dialog {
+ color: #fff;
+ background-color: transparent;
+ -moz-border-radius: 8px;
+ -moz-box-shadow: black 0 2px 2px;
+}
+
+dialog .prompt-header {
+ padding: 8px;
font-size: 18px !important;
+ -moz-border-radius: 8px 8px 0 0;
+ background-color: #36373b;
+ border-style: solid;
+ border-width: 4px 3px 2px 3px;
+ -moz-border-top-colors: black #4a4b4f;
+ -moz-border-left-colors: black #4a4b4f;
+ -moz-border-bottom-colors: black #4a4b4f;
+ -moz-border-right-colors: black #4a4b4f;
}
-dialog > scrollbox.prompt-message {
- margin: 8px 0 8px 0;
+dialog hbox > .close-button {
+ min-height: 0 !important;
+ min-width: 0 !important;
+ display: none;
}
-dialog > hbox.prompt-message {
- margin-top: 8px;
+dialog[closebutton="true"] hbox > .close-button {
+ display: -moz-box;
+}
+
+dialog .prompt-title {
+ font-size: 21px !important;
+}
+
+ at media (max-width: 499px) {
+ .modal-block {
+ padding: 32px;
+ }
+
+ dialog .prompt-header {
+ font-size: 16px !important;
+ }
+
+ dialog .prompt-title {
+ font-size: 18px !important;
+ }
}
-dialog > hbox.prompt-buttons {
+dialog .prompt-message {
margin-top: 8px;
}
+dialog .button-checkbox {
+ margin-left: 24px;
+}
+
/* buttons ----------------------------------------------------------------- */
.button-text,
.toolbarbutton-text {
@@ -152,6 +197,10 @@
color: #aaa !important;
}
+button:focus > .button-box {
+ border: 1px solid transparent;
+}
+
/* dark buttons ------------------------------------------------------------ */
/*
we set notification buttons here as well, since the style can't be set in
@@ -267,7 +316,6 @@
toolbarbutton.button-dark[type="checkbox"][checked="true"] {
/* checked overrides */
- border: 10px solid transparent !important;
color: #fff !important;
background: none !important;
padding: 2px 4px !important;
@@ -282,6 +330,32 @@
min-height: 0 !important; /* the image drives the size */
}
+/* checkbox buttons ----------------------------------------------------------- */
+.button-checkbox {
+ color: #fff;
+ padding: 0 !important;
+ background: none !important;
+ border: none !important;
+ -moz-border-image: none !important;
+}
+
+.button-checkbox .button-image-icon {
+ -moz-margin-end: 8px;
+ list-style-image: url("chrome://browser/skin/images/check-unselected-30.png");
+}
+
+.button-checkbox[checked="true"] .button-image-icon {
+ list-style-image: url("chrome://browser/skin/images/check-selected-30.png");
+}
+
+.button-checkbox:hover:active > .button-box,
+.button-checkbox[checked="true"] > .button-box {
+ padding-top: 1px;
+ padding-bottom: 2px;
+ -moz-padding-start: 3px;
+ -moz-padding-end: 4px;
+}
+
/* radio buttons ----------------------------------------------------------- */
radiogroup {
-moz-box-orient: horizontal;
More information about the MeeGo-commits
mailing list