Continuing with GUI move to events, and fixed build system missing EGL (broken build)
This commit is contained in:
parent
ef7dfcef05
commit
644bb85d99
11 changed files with 145 additions and 142 deletions
|
|
@ -15,6 +15,8 @@
|
|||
#include "EditTools/EllipseDrawEditTool.hpp"
|
||||
#include "EditTools/BrushEditTool.hpp"
|
||||
|
||||
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||
|
||||
EditTool::EditTool(DrawingProgram& initDrawP):
|
||||
DrawingProgramToolBase(initDrawP)
|
||||
{}
|
||||
|
|
@ -24,6 +26,9 @@ DrawingProgramToolType EditTool::get_type() {
|
|||
}
|
||||
|
||||
void EditTool::gui_toolbox() {
|
||||
using namespace GUIStuff;
|
||||
using namespace ElementHelpers;
|
||||
|
||||
Toolbar& t = drawP.world.main.toolbar;
|
||||
if(objInfoBeingEdited) {
|
||||
bool editHappened = compEditTool->edit_gui(objInfoBeingEdited);
|
||||
|
|
@ -32,7 +37,7 @@ void EditTool::gui_toolbox() {
|
|||
}
|
||||
else {
|
||||
t.gui.push_id("edit tool");
|
||||
t.gui.text_label_centered("Edit");
|
||||
text_label_centered(t.gui, "Edit");
|
||||
t.gui.pop_id();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue