From 36fd2caa1fbcf9bd9dea72a17982296cd8f4cfa7 Mon Sep 17 00:00:00 2001 From: "Herman S." Date: Fri, 20 Dec 2024 22:35:40 +0100 Subject: [PATCH] Fix issues with overlapping style prefixes --- mod/screen.rpy | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mod/screen.rpy b/mod/screen.rpy index 559c588..216d2ca 100644 --- a/mod/screen.rpy +++ b/mod/screen.rpy @@ -1038,19 +1038,23 @@ style fom_saysomething_picker_frame is gui_frame: style fom_saysomething_picker_frame_dark is gui_frame: background Frame(["gui/confirm_frame.png", "gui/frame_d.png"], gui.confirm_frame_borders, tile=gui.frame_tile) -style fom_saysomething_confirm_button is generic_button_light: +style fom_saysomething_confirm_fom_prompt is confirm_prompt +style fom_saysomething_confirm_fom_prompt_text is confirm_prompt_text +style fom_saysomething_confirm_fom_prompt_text_dark is confirm_prompt_text_dark + +style fom_saysomething_confirm_fom_button is generic_button_light: xysize (116, None) padding (10, 5, 10, 5) -style fom_saysomething_confirm_button_dark is generic_button_dark: +style fom_saysomething_confirm_fom_button_dark is generic_button_dark: xysize (116, None) padding (10, 5, 10, 5) -style fom_saysomething_confirm_button_text is generic_button_text_light: +style fom_saysomething_confirm_fom_button_text is generic_button_text_light: text_align 0.5 layout "subtitle" -style fom_saysomething_confirm_button_text_dark is generic_button_text_dark: +style fom_saysomething_confirm_fom_button_text_dark is generic_button_text_dark: text_align 0.5 layout "subtitle" @@ -1207,7 +1211,7 @@ screen fom_saysomething_picker(say=True): padding (0, 0) hbox: - style_prefix "fom_saysomething_confirm" + style_prefix "fom_saysomething_confirm_fom" xmaximum 350 xfill True @@ -1380,7 +1384,7 @@ screen fom_saysomething_picker(say=True): padding (0, 10, 0, 0) hbox: - style_prefix "fom_saysomething_confirm" + style_prefix "fom_saysomething_confirm_fom" xmaximum 350 xfill True @@ -1462,7 +1466,7 @@ screen fom_saysomething_picker(say=True): style_prefix "check_scrollable_menu" hbox: - style_prefix "fom_saysomething_confirm" + style_prefix "fom_saysomething_confirm_fom" xysize (210, None) spacing 5 @@ -1475,7 +1479,7 @@ screen fom_saysomething_picker(say=True): action Function(picker.select_from_clipboard) textbutton _("Reset Pose"): - style_prefix "fom_saysomething_confirm" + style_prefix "fom_saysomething_confirm_fom" xysize (210, None) action Function(picker.on_reset_pose)