Skip to content

Commit

Permalink
Message Dialog: make all option rows have the same height
Browse files Browse the repository at this point in the history 
[ci skip]
  • Loading branch information
@Vultraz
Vultraz committed Mar 5, 2018
1 parent b02e735 commit 0089357
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions data/gui/window/wml_message.cfg
View file
Expand Up @@ -251,6 +251,7 @@ where calculated_width = {__GUI_IMAGE_WIDTH}
[toggle_panel]
definition = "wml_message"

linked_group = "options"
return_value_id = "ok"
[grid]

Expand Down Expand Up @@ -479,6 +480,11 @@ where calculated_width = {__GUI_IMAGE_WIDTH}
fixed_width = true
[/linked_group]

[linked_group]
id = "options"
fixed_height = true
[/linked_group]

[tooltip]
id = "tooltip"
[/tooltip]
Expand Down Expand Up @@ -520,7 +526,7 @@ where calculated_width = {__GUI_IMAGE_WIDTH}
[/spacer]

[/column]

{_GUI_WML_MESSAGE_CONTENT}

[column]
Expand Down Expand Up @@ -592,6 +598,11 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > {MAX_TEXT_WIDTH}
fixed_width = true
[/linked_group]

[linked_group]
id = "options"
fixed_height = true
[/linked_group]

[tooltip]
id = "tooltip"
[/tooltip]
Expand Down Expand Up @@ -715,6 +726,11 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH}
fixed_width = true
[/linked_group]

[linked_group]
id = "options"
fixed_height = true
[/linked_group]

[tooltip]
id = "tooltip"
[/tooltip]
Expand Down Expand Up @@ -756,7 +772,7 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH}
[/spacer]

[/column]

{_GUI_WML_MESSAGE_CONTENT}

[column]
Expand Down

5 comments on commit 0089357

@CelticMinstrel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not so sure this is a good idea, actually... in particular, if some options have an image and others don't, it kinda makes sense if they're different heights?

@Vultraz
Copy link
Member Author

@Vultraz Vultraz commented on 0089357 Mar 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s specifically what I wanted to prevent.

@CelticMinstrel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think someone might explicitly want this though. The most obvious case would be where there's a bunch of options with images, and then the final option is a cancel option with no image.

@Vultraz
Copy link
Member Author

@Vultraz Vultraz commented on 0089357 Mar 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It still looks better to be consistent, IMO.

@CelticMinstrel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're freely mixing image and non-image rows, perhaps I could agree, but at least in the case I just mentioned, I think the unequal row heights looks better.

Please sign in to comment.