Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

A couple of minor changes.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-03-07 00:14:41 -03:00
parent 48dbedafef
commit 0dba4a222b
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eepp/ui/uiapplication.cpp
View File

@@ -56,8 +56,10 @@ UIApplication::UIApplication( const WindowSettings& windowSettings, const Settin
? appSettings.monospaceFont
: FontTrueType::New( "monospace", "assets/fonts/DejaVuSansMono.ttf" );
if ( monospaceFont && monospaceFont->getType() == FontType::TTF )
if ( monospaceFont && monospaceFont->getType() == FontType::TTF ) {
static_cast<FontTrueType*>( monospaceFont )->setEnableDynamicMonospace( true );
FontFamily::loadFromRegular( static_cast<FontTrueType*>( monospaceFont ) );
}
if ( appSettings.emojiFont == nullptr )
FontTrueType::New( "NotoEmoji-Regular", "assets/fonts/NotoEmoji-Regular.ttf" );

10
src/eepp/ui/uilistbox.cpp
View File

@@ -59,7 +59,7 @@ UIListBox::UIListBox( const std::string& tag ) :
mVScrollBar->setEnabled( false )->setVisible( false );
mVScrollBar->addEventListener( Event::OnSizeChange, cb );
mVScrollBar->addEventListener( Event::OnValueChange,
[this] ( auto event ) { onScrollValueChange( event ); } );
[this]( auto event ) { onScrollValueChange( event ); } );
mHScrollBar = UIScrollBar::NewHorizontal();
mHScrollBar->setParent( this );
@@ -68,7 +68,7 @@ UIListBox::UIListBox( const std::string& tag ) :
mHScrollBar->setEnabled( false )->setVisible( false );
mHScrollBar->addEventListener( Event::OnSizeChange, cb );
mHScrollBar->addEventListener( Event::OnValueChange,
[this] ( auto event ) { onHScrollValueChange( event ); } );
[this]( auto event ) { onHScrollValueChange( event ); } );
mDummyItem = createListBoxItem( "" );
mDummyItem->setSize( 0, 0 );
@@ -699,6 +699,12 @@ UIListBoxItem* UIListBox::getItem( const Uint32& Index ) const {
return mItems[Index];
}
const String& UIListBox::getItemText( const Uint32& Index ) const {
eeASSERT( Index < mItems.size() );
return mTexts[Index];
}
UIListBoxItem* UIListBox::getItemSelected() {
if ( mSelected.size() ) {
if ( NULL == mItems[mSelected.front()] )