From 5f6e574ffcb031aa021ae3479d102bea90c33fd1 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Fri, 29 Aug 2014 23:30:36 -0600 Subject: [PATCH] Changed Actor:scale_or_crop_background back to forcing the actor to the screen center. Changed LogDisplay's IgnoreIdentical to not ignore when hidden. --- Themes/_fallback/Scripts/02 Actor.lua | 7 ++++++- Themes/_fallback/Scripts/04 LogDisplay.lua | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua index c886ae369d..ff1e0e3bbf 100644 --- a/Themes/_fallback/Scripts/02 Actor.lua +++ b/Themes/_fallback/Scripts/02 Actor.lua @@ -178,7 +178,7 @@ bg_fit_functions= { end } -function Actor:scale_or_crop_background() +function Actor:scale_or_crop_background_no_move() local fit_mode= PREFSMAN:GetPreference("BackgroundFitMode") if bg_fit_functions[fit_mode] then bg_fit_functions[fit_mode](self, SCREEN_WIDTH, SCREEN_HEIGHT) @@ -187,6 +187,11 @@ function Actor:scale_or_crop_background() end end +function Actor:scale_or_crop_background() + self:scale_or_crop_background_no_move() + self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y) +end + function Actor:CenterX() self:x(SCREEN_CENTER_X) end function Actor:CenterY() self:y(SCREEN_CENTER_Y) end function Actor:Center() self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y) end diff --git a/Themes/_fallback/Scripts/04 LogDisplay.lua b/Themes/_fallback/Scripts/04 LogDisplay.lua index 457807c165..f9207d79be 100644 --- a/Themes/_fallback/Scripts/04 LogDisplay.lua +++ b/Themes/_fallback/Scripts/04 LogDisplay.lua @@ -149,7 +149,7 @@ local log_display_mt= { -- Long ago, someone decided that "::" should be an alias for "\n" -- and hardcoded it into BitmapText. local message= tostring(mess.message):gsub("::", ":") - if params.IgnoreIdentical then + if params.IgnoreIdentical and not self.hidden then for i, prevmess in ipairs(self.message_log) do if message == prevmess then return end end