From 79aea50736a1dd9cd285f1f7b1ab53e0d1f6d126 Mon Sep 17 00:00:00 2001 From: Kevin Anthoney Date: Sun, 27 Jul 2014 22:14:50 +0100 Subject: [PATCH] Fix disappearing text on chart screen --- src/Core/Entities/PlayerEntity.m | 4 +++- src/Core/Entities/PlayerEntityControls.m | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m index 63a83ba4..0e5104f6 100644 --- a/src/Core/Entities/PlayerEntity.m +++ b/src/Core/Entities/PlayerEntity.m @@ -7594,6 +7594,7 @@ static GLfloat sBaseMass = 0.0; - (void) setGuiToLongRangeChartScreen { OOGUIScreenID oldScreen = gui_screen; + [[UNIVERSE gui] clearAndKeepBackground:gui_screen != GUI_SCREEN_LONG_RANGE_CHART]; gui_screen = GUI_SCREEN_LONG_RANGE_CHART; target_chart_zoom = CHART_MAX_ZOOM; [self setGuiToChartScreenFrom: oldScreen]; @@ -7602,6 +7603,7 @@ static GLfloat sBaseMass = 0.0; - (void) setGuiToShortRangeChartScreen { OOGUIScreenID oldScreen = gui_screen; + [[UNIVERSE gui] clearAndKeepBackground:gui_screen != GUI_SCREEN_SHORT_RANGE_CHART]; gui_screen = GUI_SCREEN_SHORT_RANGE_CHART; [self setGuiToChartScreenFrom: oldScreen]; } @@ -7623,7 +7625,7 @@ static GLfloat sBaseMass = 0.0; // GUI stuff { - [gui clearAndKeepBackground:!guiChanged]; + //[gui clearAndKeepBackground:!guiChanged]; NSString *gal_key = [NSString stringWithFormat:@"long-range-chart-title-%d", galaxy_number]; if ([[UNIVERSE descriptions] valueForKey:gal_key] == nil) { diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m index 2e9bcbe9..04f0b0ec 100644 --- a/src/Core/Entities/PlayerEntityControls.m +++ b/src/Core/Entities/PlayerEntityControls.m @@ -3298,7 +3298,6 @@ static NSTimeInterval time_last_frame; if (!switching_chart_screens) { switching_chart_screens = YES; - [gui clearAndKeepBackground: YES]; if (gui_screen == GUI_SCREEN_SHORT_RANGE_CHART || (gui_screen == GUI_SCREEN_SYSTEM_DATA && showingLongRangeChart)) { if (gui_screen == GUI_SCREEN_SHORT_RANGE_CHART)