From db948f3dd3fa5796617dc5832922ebc3ae21b7e6 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas <21@vingtetun.org> Date: Thu, 22 Jul 2010 01:35:47 +0200 Subject: [PATCH] Bug 580213 - Enhance the look of Form Assistant and Find-In-Page [r=mfinkle] --- mobile/chrome/content/bindings.xml | 12 +++-- mobile/chrome/content/browser-ui.js | 6 +++ mobile/chrome/content/browser.js | 2 +- mobile/chrome/content/content.js | 1 + mobile/locales/en-US/chrome/browser.dtd | 3 -- mobile/themes/core/browser.css | 41 ++++++++++++++++-- mobile/themes/core/images/next-active-64.png | Bin 0 -> 1896 bytes mobile/themes/core/images/next-default-64.png | Bin 0 -> 1087 bytes .../themes/core/images/next-disabled-64.png | Bin 0 -> 1220 bytes .../themes/core/images/previous-active-64.png | Bin 0 -> 1920 bytes .../core/images/previous-default-64.png | Bin 0 -> 1061 bytes .../core/images/previous-disabled-64.png | Bin 0 -> 1161 bytes mobile/themes/core/jar.mn | 6 +++ 13 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 mobile/themes/core/images/next-active-64.png create mode 100644 mobile/themes/core/images/next-default-64.png create mode 100644 mobile/themes/core/images/next-disabled-64.png create mode 100644 mobile/themes/core/images/previous-active-64.png create mode 100644 mobile/themes/core/images/previous-default-64.png create mode 100644 mobile/themes/core/images/previous-disabled-64.png diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml index ee4bd6a010bb..9d47f3d73455 100644 --- a/mobile/chrome/content/bindings.xml +++ b/mobile/chrome/content/bindings.xml @@ -1082,13 +1082,11 @@ - - - - - - - + + + + + diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js index 8c9f37465ddf..f4fec6e8091a 100644 --- a/mobile/chrome/content/browser-ui.js +++ b/mobile/chrome/content/browser-ui.js @@ -1450,6 +1450,7 @@ var FindHelperUI = { // Listen for form assistant messages from content messageManager.addMessageListener("FindAssist:Show", this); + messageManager.addMessageListener("FindAssist:Hide", this); // Listen for events where form assistant should be closed document.getElementById("tabs").addEventListener("TabSelect", this, true); @@ -1463,6 +1464,11 @@ var FindHelperUI = { if (json.rect) this._zoom(Rect.fromRect(json.rect)); break; + + case "FindAssist:Hide": + if (this._container.getAttribute("type") == this.type) + this.hide(); + break; } }, diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js index 1d6e26ae4760..f691dce966f8 100644 --- a/mobile/chrome/content/browser.js +++ b/mobile/chrome/content/browser.js @@ -452,7 +452,7 @@ var Browser = { Browser.tabs[i].updateViewportSize(); bv.commitBatchOperation(); - + let curEl = document.activeElement; if (curEl && curEl.scrollIntoView) curEl.scrollIntoView(false); diff --git a/mobile/chrome/content/content.js b/mobile/chrome/content/content.js index bb049d3c4cc3..d880df69a352 100644 --- a/mobile/chrome/content/content.js +++ b/mobile/chrome/content/content.js @@ -490,6 +490,7 @@ Content.prototype = { if (uri) sendAsyncMessage("Browser:OpenURI", { uri: uri }); } else if (!this._formAssistant.open(element)) { + sendAsyncMessage("FindAssist:Hide", { }); this._sendMouseEvent("mousedown", element, x, y); this._sendMouseEvent("mouseup", element, x, y); } diff --git a/mobile/locales/en-US/chrome/browser.dtd b/mobile/locales/en-US/chrome/browser.dtd index 1bcac5f1ffcc..43645098a0e3 100644 --- a/mobile/locales/en-US/chrome/browser.dtd +++ b/mobile/locales/en-US/chrome/browser.dtd @@ -27,9 +27,6 @@ - - - diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css index 216b140c1023..5e3564e8f615 100644 --- a/mobile/themes/core/browser.css +++ b/mobile/themes/core/browser.css @@ -1136,20 +1136,55 @@ pageaction .pageaction-desc[value=""] { display: none; } -#content-navigator > hbox, #select-buttons { padding: 4px 8px; /* row size & core spacing */ } -#content-navigator > hbox > button, #select-buttons > button { -moz-user-focus: ignore; -moz-user-select: none; } +#content-navigator > hbox { + padding: 2px 0; /* half row size */ +} + +#content-navigator > hbox > textbox, +#content-navigator > hbox > toolbarbutton { + margin: 2px 8px; /* half row size & core spacing */ +} + +#content-navigator > hbox > toolbarbutton.previous-button { + height: 64px; + margin-right: 4px; + list-style-image: url("chrome://browser/skin/images/previous-default-64.png"); +} + +#content-navigator > hbox > toolbarbutton.previous-button:not([disabled="true"]):hover:active { + list-style-image: url("chrome://browser/skin/images/previous-active-64.png"); +} + +#content-navigator > hbox > toolbarbutton.previous-button[disabled="true"] { + list-style-image: url("chrome://browser/skin/images/previous-disabled-64.png"); +} + +#content-navigator > hbox > toolbarbutton.next-button { + height: 64px; + margin-left: 4px; + list-style-image: url("chrome://browser/skin/images/next-default-64.png"); +} + +#content-navigator > hbox > toolbarbutton.next-button:not([disabled="true"]):hover:active { + list-style-image: url("chrome://browser/skin/images/next-active-64.png"); +} + +#content-navigator > hbox > toolbarbutton.next-button[disabled="true"] { + list-style-image: url("chrome://browser/skin/images/next-disabled-64.png"); +} + #form-helper-autofill { padding: 4px 0; /* half core spacing & none (autorepeat arrows compensate) */ - border-top: 2px solid #36373b; + color: black; background-color: rgb(235,235,235); background-image: -moz-linear-gradient(top, rgb(255,255,255) 0%, rgb(235,235,235) 90%); } diff --git a/mobile/themes/core/images/next-active-64.png b/mobile/themes/core/images/next-active-64.png new file mode 100644 index 0000000000000000000000000000000000000000..34b698bfd199fb11672f3a66e5f5d4c8127d496f GIT binary patch literal 1896 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 literal 0 HcmV?d00001 diff --git a/mobile/themes/core/images/previous-disabled-64.png b/mobile/themes/core/images/previous-disabled-64.png new file mode 100644 index 0000000000000000000000000000000000000000..e99273722aedb3b8319bd7e7fe29327bdcdd8898 GIT binary patch literal 1161 zcmV;41a|w0P)Px(LrFwIRCwC$o6k?%W*Eo6uLl(+fWc{;ZY)Sc972V(c9$M9GB}h&f_qAYv}tHl zrd&A2`708R`~@7n%kXU%LNu;xS0N#hNRu#h3Xno*BGIJFyF=eh?;t;@7R8S7BU!Tb zzOnrI_<8->uksMIjzIu306qmU4qyzxJ@iLZ0bByO0Pq)pJb+rWj- z(d_K(+1%V*Sy7bo!ootWALuig%%HC8BYS&$Bm4XN4~~zIKd;y8F9H018v$Q?Jf885 zjg3E|(dZRy5Spe9t*xznd3t(!0pPcG0s=mt&vkfs_yRVJsi~^5uni=r4Q z7K<{a)WbHBQaVH_9iWs7{Q^oU71%WoF$NE%)Ke@LWlE?fjS%wIZUPun4FDMH3@^YN2n5a>0$|^$0RUtDPX>%Bic)6#?`$mK z9RM)aF}@+rjeo(e^lWzUP)a=j;@4+^f1jXs70`@Lz#R`qfFr;W;0SO8I0762=EUaa z=C`V4Tqjd5Ud8@YYBoC;d?1TFcZF9F4xVLAeads z4u?;Z$>bX|B@CDepUq}}$!4${cKhy2xi0c5>!<^ z@3n-k2+(!CBYdS&X$jwm_4ReF*AluSU~zHrekb@)DAX37myk>*J4#qyUcPS`0pW1? zq*AFgozn98e06$y`tUaJ+;C_sA(zY5R#sNd-EQ}|B?Rp3>}-WXp&JtN`Fu4H2)sTy zIr;Tt&)G^sE|;s#&(EI~3I)AbEM8b@K_nOqJ};NcKT%5Kxm@lCS(can?}e$V8f`3` z92^|{==FM)ZZ3#)eMKl33_j0fGT(Oto|mw_y}j!7dY8MsBGh#ORu4-oiCHNe0geDi zfFr;W;0SO8I0762cU?d=lgSL;6==p<