Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-01 18:50:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix stack-overflow when auto-sizing dropdowns.

Browse Source 
Fix combobox button click not closing the popup listbox when clicking the button with a visible popup listbox.
Fix some incorrect size policies in UIFileDialog.
This commit is contained in:
Martín Lucas Golini
2026-08-20 14:01:42 -03:00
parent 503cd890a5
commit f193047f1e
8 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eepp/ui/uicombobox.cpp
+1
View File
@@ -24,6 +24,7 @@ UIComboBox::UIComboBox() : UIWidget( "combobox" ), mDropDownList( NULL ), mButto
mButton->setVisible( true );
mButton->setEnabled( true );
mButton->on( Event::OnSizeChange, [this]( const Event* ) { onSizeChange(); } );
mDropDownList->addRelatedWidget( mButton );
applyDefaultTheme();
}
src/eepp/ui/uidropdown.cpp
+17 -4
View File
@@ -75,14 +75,21 @@ void UIDropDown::setFriendNode( UINode* friendNode ) {
}
void UIDropDown::onAutoSize() {
if ( mFlags & UI_AUTO_SIZING )
return;
mFlags |= UI_AUTO_SIZING;
Float max = eemax<Float>( PixelDensity::dpToPxI( getSkinSize().getHeight() ),
mTextCache.getLineSpacing() );
if ( mHeightPolicy == SizePolicy::WrapContent && mLayoutWeight == 0 ) {
if ( mHeightPolicy == SizePolicy::WrapContent ) {
setInternalPixelsHeight( eeceil( max + mPaddingPx.Top + mPaddingPx.Bottom ) );
} else if ( ( mFlags & UI_AUTO_SIZE ) && 0 == getSize().getHeight() && max > 0 ) {
setInternalPixelsHeight( eeceil( max ) );
}
mFlags &= ~UI_AUTO_SIZING;
}
UIWidget* UIDropDown::getPopUpWidget() const {
@@ -207,15 +214,21 @@ void UIDropDown::onItemKeyDown( const Event* Event ) {
}
}
void UIDropDown::onPopUpFocusLoss( const Event* ) {
void UIDropDown::onPopUpFocusLoss() {
if ( NULL == getEventDispatcher() )
return;
bool frienIsFocus = NULL != mFriendNode && mFriendNode == getEventDispatcher()->getFocusNode();
bool friendIsFocus = NULL != mFriendNode && mFriendNode == getEventDispatcher()->getFocusNode();
bool isChildFocus = isChild( getEventDispatcher()->getFocusNode() );
bool isRelatedWidget =
std::find( mRelatedWidgets.begin(), mRelatedWidgets.end(),
getEventDispatcher()->getFocusNode() ) != mRelatedWidgets.end();
if ( getEventDispatcher()->getFocusNode() != this && !isChildFocus && !frienIsFocus ) {
if ( getEventDispatcher()->getFocusNode() != this && !isChildFocus && !friendIsFocus &&
!isRelatedWidget ) {
hide();
mLastFocusLoss = Sys::getTicks();
}
}
src/eepp/ui/uidropdownlist.cpp
+10 -4
View File
@@ -31,7 +31,7 @@ UIDropDownList::UIDropDownList( const std::string& tag ) : UIDropDown( tag ), mL
// This will force to change the parent when shown, and force the CSS style reload.
mListBox->setParent( this );
mListBox->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss( event ); } );
mListBox->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss(); } );
mListBox->on( Event::OnItemSelected, [this]( auto event ) { onItemSelected( event ); } );
mListBox->on( Event::OnItemClicked, [this]( auto event ) { onItemClicked( event ); } );
mListBox->on( Event::OnItemKeyDown, [this]( auto event ) { onItemKeyDown( event ); } );
@@ -99,16 +99,22 @@ Uint32 UIDropDownList::onKeyDown( const KeyEvent& Event ) {
}
void UIDropDownList::onAutoSize() {
if ( mFlags & UI_AUTO_SIZING )
return;
UIDropDown::onAutoSize();
Float max = eemax<Float>( PixelDensity::dpToPxI( getSkinSize().getWidth() ),
getTextWidth() );
mFlags |= UI_AUTO_SIZING;
if ( mWidthPolicy == SizePolicy::WrapContent && mLayoutWeight == 0 ) {
Float max = eemax<Float>( PixelDensity::dpToPxI( getSkinSize().getWidth() ), getTextWidth() );
if ( mWidthPolicy == SizePolicy::WrapContent ) {
setInternalPixelsWidth( eeceil( max + mPaddingPx.Left + mPaddingPx.Right ) );
} else if ( ( mFlags & UI_AUTO_SIZE ) && 0 == getSize().getWidth() && max > 0 ) {
setInternalPixelsWidth( eeceil( max ) );
}
mFlags &= ~UI_AUTO_SIZING;
}
UIDropDownList* UIDropDownList::showList() {
src/eepp/ui/uidropdownmodellist.cpp
+2 -2
View File
@@ -29,7 +29,7 @@ UIDropDownModelList::UIDropDownModelList( const std::string& tag ) :
mListView->setParent( this );
mListView->setSingleClickNavigation( true );
mListView->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss( event ); } );
mListView->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss(); } );
mListView->on( Event::OnModelEvent, [this]( auto event ) { onItemSelected( event ); } );
mListView->on( Event::KeyDown, [this]( auto event ) { onItemKeyDown( event ); } );
mListView->on( Event::OnClear, [this]( auto event ) { onWidgetClear( event ); } );
@@ -87,7 +87,7 @@ void UIDropDownModelList::setListView( UIAbstractTableView* listView ) {
mListView->setVisible( false );
mListView->setParent( this );
mListView->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss( event ); } );
mListView->on( Event::OnWidgetFocusLoss, [this]( auto event ) { onPopUpFocusLoss(); } );
mListView->on( Event::OnModelEvent, [this]( auto event ) { onItemSelected( event ); } );
mListView->on( Event::KeyDown, [this]( auto event ) { onItemKeyDown( event ); } );
mListView->on( Event::OnClear, [this]( auto event ) { onWidgetClear( event ); } );
src/eepp/ui/uifiledialog.cpp
+3 -3
View File
@@ -110,7 +110,7 @@ UIFileDialog::UIFileDialog( Uint32 dialogFlags, const std::string& defaultFilePa
mPath = UITextInput::New();
mPath->setText( mCurPath )
->setLayoutSizePolicy( SizePolicy::WrapContent, SizePolicy::WrapContent )
->setLayoutSizePolicy( SizePolicy::Fixed, SizePolicy::WrapContent )
->setLayoutWeight( 1 )
->setParent( hLayout );
mPath->on( Event::OnPressEnter, [this]( auto event ) { onPressEnter( event ); } );
@@ -176,7 +176,7 @@ UIFileDialog::UIFileDialog( Uint32 dialogFlags, const std::string& defaultFilePa
mMultiView = UIMultiModelView::New();
mMultiView->setParent( linearLayout );
mMultiView->setLayoutSizePolicy( SizePolicy::MatchParent, SizePolicy::WrapContent )
mMultiView->setLayoutSizePolicy( SizePolicy::MatchParent, SizePolicy::Fixed )
->setLayoutWeight( 1 )
->setLayoutMargin( Rectf( 0, 0, 0, 4 ) );
mMultiView->on( Event::KeyDown, [this]( const Event* event ) {
@@ -245,7 +245,7 @@ UIFileDialog::UIFileDialog( Uint32 dialogFlags, const std::string& defaultFilePa
->setEnabled( false );
mFile = UITextInput::New();
mFile->setLayoutSizePolicy( SizePolicy::WrapContent, SizePolicy::MatchParent )
mFile->setLayoutSizePolicy( SizePolicy::Fixed, SizePolicy::MatchParent )
->setLayoutWeight( 1 )
->setParent( hLayout );
mFile->setLayoutMargin( Rectf( 0, 0, 4, 0 ) );