Some little fixes

This commit is contained in:
Flakebi 2014-07-15 17:57:37 +02:00
parent c322c507da
commit a9a46a2dd6
5 changed files with 6 additions and 3 deletions

View File

@ -608,7 +608,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
if (w == NULL) break; if (w == NULL) break;
if (!w->m_focusable) return GUIEngine::EVENT_BLOCK; if (!w->isFocusable() || !w->isActivated()) return GUIEngine::EVENT_BLOCK;
// When a modal dialog is shown, don't select widgets out of the dialog // When a modal dialog is shown, don't select widgets out of the dialog
if (ModalDialog::isADialogActive() && !ModalDialog::getCurrent()->isMyChild(w)) if (ModalDialog::isADialogActive() && !ModalDialog::getCurrent()->isMyChild(w))

View File

@ -71,7 +71,7 @@ namespace GUIEngine
GAMEPAD_BADGE = 16, GAMEPAD_BADGE = 16,
/** A keyboard icon */ /** A keyboard icon */
KEYBOARD_BADGE = 32, KEYBOARD_BADGE = 32,
/** An hourglass badge to indocate loading */ /** An hourglass badge to indicate loading */
LOADING_BADGE = 64 LOADING_BADGE = 64
}; };

View File

@ -50,6 +50,8 @@ LabelWidget::LabelWidget(bool title, bool bright) : Widget(WTYPE_LABEL)
} }
else else
m_has_color = false; m_has_color = false;
setFocusable(false);
} // LabelWidget } // LabelWidget
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@ -34,6 +34,7 @@ ProgressBarWidget::ProgressBarWidget(bool show_label) : Widget(WTYPE_PROGRESS)
{ {
m_value = 0; m_value = 0;
m_show_label = show_label; m_show_label = show_label;
setFocusable(false);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

View File

@ -387,7 +387,7 @@ void TrackObjectPresentationMesh::init(const XMLNode* xml_node, scene::ISceneNod
m_frame_start = 0; m_frame_start = 0;
m_frame_end = 0; m_frame_end = 0;
if (World::getWorld() != NULL && World::getWorld()->getTrack() != NULL) if (World::getWorld() != NULL && World::getWorld()->getTrack() != NULL && xml_node != NULL)
World::getWorld()->getTrack()->handleAnimatedTextures(m_node, *xml_node); World::getWorld()->getTrack()->handleAnimatedTextures(m_node, *xml_node);
} }
//#ifdef DEBUG //#ifdef DEBUG