GUI tweaks and fixes

This commit is contained in:
stujones11 2018-05-25 19:29:15 +01:00
parent 71f145d01c
commit 16ee1d80a7
2 changed files with 7 additions and 7 deletions

View File

@ -421,31 +421,31 @@ void GUI::initToolBar()
IGUIToolBar *toolbar = env->addToolBar(0, E_GUI_ID_TOOLBAR);
text = env->addStaticText(L"Animation:",
rect<s32>(20,5,120,25), false, false, toolbar);
rect<s32>(20,6,120,25), false, false, toolbar);
text = env->addStaticText(L"Start",
rect<s32>(130,5,160,25), false, false, toolbar);
rect<s32>(130,6,160,25), false, false, toolbar);
spin = env->addSpinBox(L"", rect<s32>(170,5,230,25),
true, toolbar, E_GUI_ID_ANIM_START);
spin->setDecimalPlaces(0);
spin->setRange(0, 10000);
text = env->addStaticText(L"End",
rect<s32>(255,5,280,25), false, false, toolbar);
rect<s32>(255,6,280,25), false, false, toolbar);
spin = env->addSpinBox(L"", rect<s32>(290,5,350,25),
true, toolbar, E_GUI_ID_ANIM_END);
spin->setDecimalPlaces(0);
spin->setRange(0, 10000);
text = env->addStaticText(L"Speed",
rect<s32>(370,5,410,25), false, false, toolbar);
rect<s32>(370,6,410,25), false, false, toolbar);
spin = env->addSpinBox(L"", rect<s32>(420,5,480,25),
true, toolbar, E_GUI_ID_ANIM_SPEED);
spin->setDecimalPlaces(0);
spin->setRange(0, 10000);
text = env->addStaticText(L"Frame",
rect<s32>(495,5,535,25), false, false, toolbar);
rect<s32>(495,6,535,25), false, false, toolbar);
spin = env->addSpinBox(L"", rect<s32>(550,5,610,25),
true, toolbar, E_GUI_ID_ANIM_FRAME);
spin->setDecimalPlaces(0);

View File

@ -468,7 +468,7 @@ bool Viewer::OnEvent(const SEvent &event)
}
}
else if (event.EventType == EET_KEY_INPUT_EVENT &&
event.KeyInput.PressedDown)
event.KeyInput.PressedDown && !gui->getFocused())
{
switch (event.KeyInput.Key)
{
@ -545,7 +545,7 @@ bool Viewer::OnEvent(const SEvent &event)
else
fov = M_ZOOM_IN(fov);
setProjection();
break;
return true;
}
default:
break;