From 724fa1a182c3107e485543087258be19d04117bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Sun, 25 Mar 2012 18:10:36 +0200 Subject: [PATCH] Bug 585946 - Location / search bar splitter moves to the end of the toolbar when toggling "tabs on top". r=neil --- browser/base/content/browser.js | 1 + toolkit/content/tests/chrome/Makefile.in | 5 +- .../content/tests/chrome/test_bug585946.xul | 51 +++++++++++++++++++ toolkit/content/widgets/toolbar.xml | 6 +++ 4 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 toolkit/content/tests/chrome/test_bug585946.xul diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 8cb0fdf11f00..cc8f4e4a474f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2624,6 +2624,7 @@ function UpdateUrlbarSearchSplitterState() splitter.id = "urlbar-search-splitter"; splitter.setAttribute("resizebefore", "flex"); splitter.setAttribute("resizeafter", "flex"); + splitter.setAttribute("skipintoolbarset", "true"); splitter.className = "chromeclass-toolbar-additional"; } urlbar.parentNode.insertBefore(splitter, ibefore); diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in index 6bf709855304..85e6d1eea8f3 100644 --- a/toolkit/content/tests/chrome/Makefile.in +++ b/toolkit/content/tests/chrome/Makefile.in @@ -109,10 +109,6 @@ _TEST_FILES = findbar_window.xul \ RegisterUnregisterChrome.js \ test_panel.xul \ window_panel.xul \ - $(NULL) - - -_TEST_FILES += \ test_bug360220.xul \ test_bug365773.xul \ test_bug382990.xul \ @@ -122,6 +118,7 @@ _TEST_FILES += \ test_bug554279.xul \ test_bug557987.xul\ test_bug562554.xul \ + test_bug585946.xul \ test_button.xul \ test_closemenu_attribute.xul \ test_colorpicker_popup.xul \ diff --git a/toolkit/content/tests/chrome/test_bug585946.xul b/toolkit/content/tests/chrome/test_bug585946.xul new file mode 100644 index 000000000000..738e46b1b1d2 --- /dev/null +++ b/toolkit/content/tests/chrome/test_bug585946.xul @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml index ad15ac8600ee..9b6835a7a2ff 100644 --- a/toolkit/content/widgets/toolbar.xml +++ b/toolkit/content/widgets/toolbar.xml @@ -180,6 +180,9 @@