Merge pull request #174 from smurphos/metacity-fix

Metacity - add buttons to modal geometry & fix attached dialog titlebar.
master
Nico 2019-03-14 19:32:44 +01:00 committed by GitHub
commit 2fd7d97ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions

View File

@ -497,7 +497,7 @@
<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
</frame_style>
<frame_style name="modal_dialog_focused" geometry="modal">
<frame_style name="modal_dialog_focused" geometry="normal">
<piece position="entire_background" draw_ops="entire_background_focused" />
<piece position="titlebar" draw_ops="titlebar_focused" />
<piece position="title" draw_ops="title_focused" />
@ -525,7 +525,7 @@
<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
</frame_style>
<frame_style name="modal_dialog_unfocused" geometry="modal">
<frame_style name="modal_dialog_unfocused" geometry="normal">
<piece position="entire_background" draw_ops="entire_background_unfocused" />
<piece position="titlebar" draw_ops="titlebar_focused" />
<piece position="title" draw_ops="title_unfocused" />

View File

@ -86,7 +86,7 @@
<border name="title_border" left="10" right="10" top="0" bottom="0" />
</frame_geometry>
<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">
<frame_geometry name="modal" title_scale="small" hide_buttons="false" rounded_top_left="1" rounded_top_right="1" parent="small">
<distance name="title_vertical_pad" value="5"/>
</frame_geometry>

View File

@ -104,16 +104,11 @@
<distance name="button_height" value="0"/>
</frame_geometry>
<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">
<frame_geometry name="modal" title_scale="small" hide_buttons="false" rounded_top_left="1" rounded_top_right="1" parent="small">
<distance name="title_vertical_pad" value="5"/>
</frame_geometry>
<!--chromium save dialog-->
<frame_geometry name="attached" title_scale="small" has_title="false" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_left="0" rounded_bottom_right="0" parent="normal">
<distance name="title_vertical_pad" value="0"/>
<distance name="bottom_height" value="1"/>
<distance name="left_width" value="1"/>
<distance name="right_width" value="1"/>
<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">
</frame_geometry>
<!-- drawing operations -->
@ -733,6 +728,8 @@
<frame_style name="attached_focused" geometry="attached">
<piece position="entire_background" draw_ops="entire_background_focused" />
<piece position="titlebar" draw_ops="titlebar_focused" />
<piece position="title" draw_ops="title_focused" />
<piece position="overlay" draw_ops="border_focused" />
<button function="close" state="normal"><draw_ops></draw_ops></button>
<button function="close" state="pressed"><draw_ops></draw_ops></button>
<button function="maximize" state="normal"><draw_ops></draw_ops></button>
@ -758,6 +755,8 @@
<frame_style name="attached_unfocused" geometry="attached">
<piece position="entire_background" draw_ops="entire_background_unfocused" />
<piece position="titlebar" draw_ops="titlebar_unfocused" />
<piece position="title" draw_ops="title_unfocused" />
<piece position="overlay" draw_ops="border_unfocused" />
<button function="close" state="normal"><draw_ops></draw_ops></button>
<button function="close" state="pressed"><draw_ops></draw_ops></button>
<button function="maximize" state="normal"><draw_ops></draw_ops></button>