wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 885242 - Part 5 - Fix back button in and otherwise clean up panel UI. r=mbrubeck

Browse Source 
--HG--
extra : rebase_source : d1445865c75f7c9853638b3279260f208bde223a
This commit is contained in:
Jonathan Wilde 2013-07-18 00:21:40 -07:00
parent b2eacd6eb5
commit ac1b1e0138
2 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
browser/metro/base/content/browser.xul
View File

@ -304,53 +304,78 @@
</vbox>
</appbar>
<vbox id="panel-container" hidden="true" class="window-width window-height meta" observes="bcast_windowState">
<vbox id="panel-container" class="window-width window-height meta"
hidden="true" observes="bcast_windowState">
<hbox id="panel-header">
<toolbarbutton id="panel-close-button" command="cmd_panel"/>
<toolbarbutton id="panel-close-button" class="appbar-primary"
command="cmd_panel"/>
<menulist id="panel-view-switcher" oncommand="PanelUI.switchPane(this.value);">
<menulist id="panel-view-switcher"
oncommand="PanelUI.switchPane(this.value);">
<menupopup>
<menuitem label="&bookmarksHeader.label;" value="bookmarks-container" id="menuitem-bookmarks"/>
<menuitem label="&startHistoryHeader.label;" value="history-container" id="menuitem-history"/>
<menuitem label="&startRemoteTabsHeader.label;" value="remotetabs-container" id="menuitem-remotetabs"/>
<menuitem label="&consoleHeader.label;" value="console-container" id="menuitem-console"/>
<menuitem id="menuitem-bookmarks" value="bookmarks-container"
label="&bookmarksHeader.label;"/>
<menuitem id="menuitem-history" value="history-container"
label="&startHistoryHeader.label;"/>
<menuitem id="menuitem-remotetabs" value="remotetabs-container"
label="&startRemoteTabsHeader.label;"/>
<menuitem id="menuitem-console" value="console-container"
label="&consoleHeader.label;"/>
</menupopup>
</menulist>
</hbox>
<deck id="panel-items" selectedIndex="0" flex="1" >
<scrollbox id="bookmarks-container" flex="1">
<richgrid id="bookmarks-list" noun="bookmark" class="canSnapTiles" seltype="multiple" flex="1"/>
<richgrid id="bookmarks-list" class="canSnapTiles" noun="bookmark"
seltype="multiple" flex="1"/>
</scrollbox>
<scrollbox id="history-container" flex="1">
<richgrid id="history-list" noun="history" class="canSnapTiles" seltype="multiple" flex="1"/>
<richgrid id="history-list" class="canSnapTiles" noun="history"
seltype="multiple" flex="1"/>
</scrollbox>
<scrollbox id="downloads-container" flex="1">
<richgrid id="downloads-list" noun="download" class="canSnapTiles" seltype="single" flex="1"/>
<richgrid id="downloads-list" class="canSnapTiles" noun="download"
seltype="single" flex="1"/>
</scrollbox>
<scrollbox id="remotetabs-container" flex="1">
<richgrid id="remotetabs-list" noun="tab" class="canSnapTiles" seltype="single" flex="1"/>
<richgrid id="remotetabs-list" class="canSnapTiles" noun="tab"
seltype="single" flex="1"/>
</scrollbox>
<vbox id="console-container" flex="1">
<vbox id="console-header" class="panel-list">
<label class="panel-header" value="&consoleHeader.label;"/>
<hbox align="center">
<label value="&consoleCodeEval.label;" control="console-eval-textbox"/>
<textbox id="console-eval-textbox" class="toolbar search-bar" value="" onkeypress="ConsolePanelView.onEvalKeyPress(event)" flex="1"/>
<button id="console-button-eval" class="show-text" label="&consoleEvaluate.label;" oncommand="ConsolePanelView.evaluateTypein()"/>
<label value="&consoleCodeEval.label;"
control="console-eval-textbox"/>
<textbox id="console-eval-textbox" class="toolbar search-bar"
value="" flex="1"
onkeypress="ConsolePanelView.onEvalKeyPress(event)"/>
<button id="console-button-eval" class="show-text"
label="&consoleEvaluate.label;"
oncommand="ConsolePanelView.evaluateTypein()"/>
</hbox>
<hbox align="center" pack="end">
<radiogroup id="console-filter" oncommand="ConsolePanelView.changeMode();">
<radio id="console-filter-all" label="&consoleAll.label;" value="all" selected="true"/>
<radio id="console-filter-messages" label="&consoleMessages.label;" value="message"/>
<radio id="console-filter-warnings" label="&consoleWarnings.label;" value="warning"/>
<radio id="console-filter-errors" label="&consoleErrors.label;" value="error"/>
<radiogroup id="console-filter"
oncommand="ConsolePanelView.changeMode();">
<radio id="console-filter-all" value="all" selected="true"
label="&consoleAll.label;"/>
<radio id="console-filter-messages" value="message"
label="&consoleMessages.label;"/>
<radio id="console-filter-warnings" value="warning"
label="&consoleWarnings.label;"/>
<radio id="console-filter-errors" value="error"
label="&consoleErrors.label;"/>
</radiogroup>
<button id="console-clear" class="show-text" oncommand="ConsolePanelView.clearConsole();" label="&consoleClear.label;"/>
<button id="console-clear" class="show-text"
label="&consoleClear.label;"
oncommand="ConsolePanelView.clearConsole();"/>
</hbox>
</vbox>
<richlistbox id="console-box" class="panel-list console-box" flex="1" onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)" oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
<richlistbox id="console-box" class="panel-list console-box" flex="1"
onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)"
oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
</vbox>
</deck>
</vbox>

21
browser/metro/theme/browser.css
View File

@ -725,28 +725,21 @@ documenttab[selected] .documenttab-selection {
}
#panel-close-button {
background: transparent;
border: 0 none;
-moz-appearance: none;
margin: 0;
-moz-margin-end: 40px;
list-style-image: url(chrome://browser/skin/images/appbar-back.png);
-moz-image-region: rect(0 40px 40px 0);
padding: 0;
min-height: 40px;
max-height: 40px;
list-style-image: url(chrome://browser/skin/images/navbar-back.png);
-moz-box-pack: center;
}
@media (min-resolution: 130dpi) {
@media (min-resolution: @min_res_140pc@) {
#panel-close-button {
list-style-image: url(chrome://browser/skin/images/appbar-back@1.4x.png);
width: 40px;
list-style-image: url(chrome://browser/skin/images/navbar-back@1.4x.png);
}
}
#panel-close-button[disabled] {
opacity: .5;
@media (min-resolution: @min_res_180pc@) {
#panel-close-button {
list-style-image: url(chrome://browser/skin/images/navbar-back@1.8x.png);
}
}
#panel-view-switcher {