Skip to content

Commit 3184747

Browse files
committed
Disable frame time label
1 parent 8c68569 commit 3184747

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Editor/EditorApp.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ namespace RTEGUI {
212212
m_UnsavedChanges = m_EditorManager->UpdateControlProperties(m_EditorManager->GetCurrentSelection().GetControl(), true);
213213
m_EditorManager->UpdateCollectionBoxList();
214214
m_EditorManager->UpdateCollectionBoxChildrenList(dynamic_cast<GUICollectionBox *>(m_EditorManager->GetCurrentSelection().GetControl()));
215+
m_EditorManager->RemoveFocus();
215216
} else if (controlName == "CollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {
216217
m_EditorManager->SelectActiveControlFromParentList();
217218
} else if (controlName == "ControlsInCollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {
@@ -220,8 +221,10 @@ namespace RTEGUI {
220221
m_EditorManager->UpdateSnapGridSize(editorEvent);
221222
} else if (controlName == "SnapCheckBox") {
222223
EditorSelection::s_SnapToGrid = dynamic_cast<GUICheckbox *>(editorEvent.GetControl())->GetCheck() == GUICheckbox::Checked;
224+
m_EditorManager->RemoveFocus();
223225
} else if (controlName == "ZoomCheckBox") {
224226
m_ZoomWorkspace = (dynamic_cast<GUICheckbox *>(editorEvent.GetControl()))->GetCheck() == GUICheckbox::Checked;
227+
m_EditorManager->RemoveFocus();
225228
}
226229
break;
227230
default:
@@ -231,7 +234,7 @@ namespace RTEGUI {
231234
ProcessMouseInput();
232235
ProcessKeyboardInput();
233236

234-
m_EditorManager->SetFrameTimeLabelText(s_FrameTime);
237+
//m_EditorManager->SetFrameTimeLabelText(s_FrameTime);
235238

236239
return !m_Quit;
237240
}

Editor/EditorManager.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ namespace RTEGUI {
2626
m_EditorBase->SetDrawColor(makecol(32, 32, 32));
2727
m_EditorBase->SetDrawType(GUICollectionBox::Color);
2828

29-
GUILabel *frameTimeLabel = dynamic_cast<GUILabel *>(m_EditorControlManager->AddControl("FrameTimer", "LABEL", m_EditorBase.get(), 300, 10, 100, 20));
30-
frameTimeLabel->SetText("Frame Time: 0");
29+
//GUILabel *frameTimeLabel = dynamic_cast<GUILabel *>(m_EditorControlManager->AddControl("FrameTimer", "LABEL", m_EditorBase.get(), 300, 10, 100, 20));
30+
//frameTimeLabel->SetText("Frame Time: 0");
3131

3232
m_LeftColumn.reset(dynamic_cast<GUICollectionBox *>(m_EditorControlManager->AddControl("LeftColumn", "COLLECTIONBOX", nullptr, 0, 0, 290, screen->GetBitmap()->GetHeight())));
3333
m_LeftColumn->SetDrawBackground(true);
@@ -507,7 +507,6 @@ namespace RTEGUI {
507507
m_PropertyPage->SetPropertyValues(&properties);
508508
result = true;
509509
}
510-
RemoveFocus();
511510
return result;
512511
}
513512
}

0 commit comments

Comments
 (0)