From 157acc7926b942a852c2eb08d97a076345eace60 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 14 Nov 2018 15:32:24 +0100 Subject: [PATCH] Revert "infoviewer: force repaint of text fields" This reverts commit e63d8b6999faf975f9f238e22cc30035746605f6. kill() does not consider screen buffer. But call of 'paint(CC_SAVE_SCREEN_YES)' generates buffer but always never used so far. Before we apply new text, hide() will reset background with saved buffer. Btw. kill() seems was never called, because isPainted was until recently broken in text object, so I'm amazed that this 'if' block was with any effect. --- src/gui/infoviewer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 3cd7e16ed..23f38992f 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1777,7 +1777,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_curr_event = new CComponentsTextTransp(NULL, xStart, CurrInfoY - height, currTimeX - xStart, height); else { if (txt_curr_event->isPainted()) - txt_curr_event->kill(); + txt_curr_event->hide(); txt_curr_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart, height); } txt_curr_event->setItemName("txt_curr_event"); @@ -1789,7 +1789,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_curr_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height); else { if (txt_curr_start->isPainted()) - txt_curr_start->kill(); + txt_curr_start->hide(); txt_curr_start->setDimensionsAll(InfoX, CurrInfoY - height, info_time_width, height); } txt_curr_start->setItemName("txt_curr_start"); @@ -1804,7 +1804,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); else { if (txt_curr_rest->isPainted()) - txt_curr_rest->kill(); + txt_curr_rest->hide(); txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); } txt_curr_rest->setItemName("txt_curr_rest"); @@ -1819,7 +1819,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_next_event = new CComponentsTextTransp(NULL, xStart, NextInfoY, nextTimeX - xStart, height); else { if (txt_next_event->isPainted()) - txt_next_event->kill(); + txt_next_event->hide(); txt_next_event->setDimensionsAll(xStart, NextInfoY, nextTimeX - xStart, height); } txt_next_event->setItemName("txt_next_event"); @@ -1831,7 +1831,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_next_start = new CComponentsTextTransp(NULL, InfoX, NextInfoY, info_time_width, height); else { if (txt_next_start->isPainted()) - txt_next_start->kill(); + txt_next_start->hide(); txt_next_start->setDimensionsAll(InfoX, NextInfoY, info_time_width, height); } txt_next_start->setItemName("txt_next_start"); @@ -1844,7 +1844,7 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_next_in = new CComponentsTextTransp(NULL, nextTimeX, NextInfoY, nextTimeW, height); else { if (txt_next_in->isPainted()) - txt_next_in->kill(); + txt_next_in->hide(); txt_next_in->setDimensionsAll(nextTimeX, NextInfoY, nextTimeW, height); } txt_next_in->setItemName("txt_next_in");