Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 10:43:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialogs fixed as part of Composer color button fix to bug 77873, fix by neil@parkwaycc.co.uk, r=cmanske, sr=hewitt

Browse Source
This commit is contained in:
cmanske%netscape.com 2001-09-29 04:35:02 +00:00
parent 7a1b52ad6d
commit 55dac8640c
3 changed files with 27 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/ui/dialogs/content/EdColorPicker.xul
View File

@ -66,21 +66,12 @@
-->
<spacer class="spacer"/>
<vbox flex="1">
<stack valign="middle" autostretch="never">
<button id="LastPickedButton" class="dialog" label="&lastPickedColor.label;"
style="margin-left:0px; margin-right: 0px;"
oncommand="SelectLastPickedColor();"/>
<hbox style="margin-left: 5px" mousethrough="always">
<vbox autostretch="never">
<spacer flex="1"/>
<button id="LastPickedButton" crop="right" oncommand="SelectLastPickedColor();">
<spacer id="LastPickedColor"
LastTextColor="" LastBackgroundColor=""
persist="LastTextColor LastBackgroundColor"/>
<spacer flex="1"/>
</vbox>
<spacer flex="1"/>
</hbox>
</stack>
<label value="&lastPickedColor.label;" flex="1" style="text-align: center;"/>
</button>
<text class="label" value="&setColor1.label;"/>
<text class="label" value="&setColor2.label;"/>
<text class="label" value="&setColorExample.label;"/>

45
editor/ui/dialogs/content/EdColorProps.xul
View File

@ -61,58 +61,33 @@
<rows>
<row valign="middle" autostretch="never">
<text class="label" id="Text" value="&normalText.label;&colon.character;" />
<stack>
<button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button id="TextButton" class="color-button" oncommand="GetColorAndUpdate('textCW');">
<spacer id="textCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
</row>
<row valign="middle" autostretch="never">
<text class="label" id="Link" value="&linkText.label;&colon.character;" />
<stack>
<button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button id="LinkButton" class="color-button" oncommand="GetColorAndUpdate('linkCW');">
<spacer id="linkCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
</row>
<row valign="middle" autostretch="never">
<text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
<stack>
<button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button id="ActiveLinkButton" class="color-button" oncommand="GetColorAndUpdate('activeCW');">
<spacer id="activeCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
</row>
<row valign="middle" autostretch="never">
<text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
<stack>
<button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button id="VisitedLinkButton" class="color-button" oncommand="GetColorAndUpdate('visitedCW');">
<spacer id="visitedCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
</row>
<row valign="middle" autostretch="never">
<text class="label" id="Background" value="&background.label;" />
<stack>
<button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button id="BackgroundButton" class="color-button" oncommand="GetColorAndUpdate('backgroundCW');">
<spacer id="backgroundCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
</row>
</rows>
</grid>

18
editor/ui/dialogs/content/EdTableProps.xul
View File

@ -127,14 +127,9 @@
<separator class="groove"/>
<hbox valign="middle" autostretch="never">
<text class="label" value="&backgroundColor.label;"/>
<stack>
<button class="dialog color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button class="color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');">
<spacer id="tableBackgroundCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
<spacer class="spacer"/>
<text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
</hbox>
@ -244,14 +239,9 @@
<separator class="groove"/>
<hbox valign="middle" autostretch="never">
<checkbox id="CellColorCheckbox" label="&backgroundColor.label;"/>
<stack>
<button class="dialog color-button" oncommand="GetColorAndUpdate('cellBackgroundCW');" flex="1"/>
<hbox autostretch="never" valign="middle" mousethrough="always">
<spacer flex="1"/>
<button class="color-button" oncommand="GetColorAndUpdate('cellBackgroundCW');">
<spacer id="cellBackgroundCW" class="color-well"/>
<spacer flex="1"/>
</hbox>
</stack>
</button>
<spacer class="spacer"/>
<text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
</hbox>