From 7043bf93567689f3b1304cc998c1fb09b7e0e357 Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Wed, 25 Oct 2017 19:17:00 -0200 Subject: Fixed textures bug on linux --- Project/ControlEditor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Project/ControlEditor.cpp') diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index deaf3c2..45cc10d 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -45,7 +45,6 @@ ControlElementButton::ControlElementButton(wxWindow* parent, wxString label, wxI : wxWindow(parent, id) { SetBackgroundColour(*wxWHITE); - // m_font = wxFont(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); m_label = label; m_image = image; @@ -644,13 +643,14 @@ void ControlEditor::OnIdle(wxIdleEvent& event) { if(m_justOpened) { this->Raise(); - Redraw(); + + // Update all text elements + m_justOpened = false; for(auto it = m_elementList.begin(), itEnd = m_elementList.end(); it != itEnd; ++it) { ControlElement* element = *it; - element->UpdateText(); + if(!element->UpdateText()) m_justOpened = true; } Redraw(); - m_justOpened = false; } } void ControlEditor::OnKeyDown(wxKeyEvent& event) -- cgit