From c60973435760d9d6d1c1fa30cb7212c952021809 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Thu, 30 Sep 2021 11:06:28 -0500 Subject: [PATCH] Fixed confirm and tacnet dialogs not using correct titlebar background and border colors --- lib/dialogs/confirm_dialog.rb | 5 ++--- lib/dialogs/tacnet_dialog.rb | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/dialogs/confirm_dialog.rb b/lib/dialogs/confirm_dialog.rb index d80a0fa..ff07d4e 100644 --- a/lib/dialogs/confirm_dialog.rb +++ b/lib/dialogs/confirm_dialog.rb @@ -7,9 +7,8 @@ module TAC color = @dangerous ? Palette::DANGEROUS : Palette::ALERT - - @dialog_root.style.border_color = [ color, darken(color, 50) ] - @titlebar.style.background = [ color, darken(color, 50) ] + @dialog_root.style.default[:border_color] = [ color, darken(color, 50) ] + @titlebar.style.default[:background] = [ color, darken(color, 50) ] background Gosu::Color::GRAY label @options[:message] diff --git a/lib/dialogs/tacnet_dialog.rb b/lib/dialogs/tacnet_dialog.rb index edeaba3..b291934 100644 --- a/lib/dialogs/tacnet_dialog.rb +++ b/lib/dialogs/tacnet_dialog.rb @@ -2,8 +2,8 @@ module TAC class Dialog class TACNETDialog < Dialog def build - @dialog_root.style.border_color = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ] - @titlebar.style.background = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ] + @dialog_root.style.default[:border_color] = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ] + @titlebar.style.default[:background] = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ] background Gosu::Color::GRAY label @options[:message], width: 1.0