Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-31 10:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

More fixes.

Browse Source
This commit is contained in:
spartanj
2010-12-09 17:57:08 -03:00
parent a501124e03
commit 82f85fa994
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/cuimenucheckbox.cpp
View File

@@ -42,7 +42,7 @@ void cUIMenuCheckBox::Active( const bool& active ) {
if ( mActive ) {
if ( NULL != mSkinActive ) {
if ( mSkinState->GetState() == cUISkinState::StateMouseEnter )
if ( mSkinState->GetState() == cUISkinState::StateSelected )
Icon( mSkinActive->GetShape( cUISkinState::StateMouseEnter ) );
else
Icon( mSkinActive->GetShape( cUISkinState::StateNormal ) );
@@ -50,7 +50,7 @@ void cUIMenuCheckBox::Active( const bool& active ) {
mIcon->Shape( NULL );
} else {
if ( NULL != mSkinInactive )
if ( mSkinState->GetState() == cUISkinState::StateMouseEnter )
if ( mSkinState->GetState() == cUISkinState::StateSelected )
Icon( mSkinInactive->GetShape( cUISkinState::StateMouseEnter ) );
else
Icon( mSkinInactive->GetShape( cUISkinState::StateNormal ) );

2
src/ui/cuimenusubmenu.cpp
View File

@@ -51,7 +51,7 @@ void cUIMenuSubMenu::OnStateChange() {
cUIMenuItem::OnStateChange();
if ( NULL != mSkinArrow ) {
if ( mSkinState->GetState() == cUISkinState::StateMouseEnter )
if ( mSkinState->GetState() == cUISkinState::StateSelected )
mArrow->Shape( mSkinArrow->GetShape( cUISkinState::StateMouseEnter ) );
else
mArrow->Shape( mSkinArrow->GetShape( cUISkinState::StateNormal ) );

4
src/ui/cuiskinstate.cpp
View File

@@ -24,6 +24,10 @@ void cUISkinState::StateBack( const Uint32& State ) {
return;
}
if ( mCurState == StateSelected && ( State == StateMouseDown || State == StateFocus ) ) {
return;
}
if ( !( mCurState == StateFocus && ( State == StateMouseEnter || State == StateMouseExit || State == StateMouseDown ) ) ) {
mLastState = mCurState;
mCurState = StateNormal;