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

FontTrueType: Improved font kerning. Added FontTrueType::getGlyphByIndex.

Browse Source 
TextDocument: Added hasUndo, hasRedo.
UICodeEditor: Improved default context menu.
UITextInput: Added context menu.
UIFileDialog: Minor improvents, localization and path selection.
UIMessageBox: Improved localization.
Fixed UITableView::findRowWithText and UITreeView::findRowWithText when doing case insensitive searches.
ecode: Fix Sans Serif font selection was breaking the current opened code editors.
This commit is contained in:
Martín Lucas Golini
2022-03-27 01:35:57 -03:00
parent 20b84171e9
commit c1b03ca7af
34 changed files with 391 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tools/codeeditor/codeeditor.cpp
View File

@@ -173,7 +173,7 @@ void App::openFolderDialog() {
dialog->show();
}
void App::openFontDialog( std::string& fontPath ) {
void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
std::string absoluteFontPath( fontPath );
if ( FileSystem::isRelativePath( absoluteFontPath ) )
absoluteFontPath = mResPath + fontPath;
@@ -188,12 +188,19 @@ void App::openFontDialog( std::string& fontPath ) {
dialog->setWinFlags( UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL );
dialog->setTitle( "Select Font File" );
dialog->setCloseShortcut( KEY_ESCAPE );
dialog->addEventListener( Event::OpenFile, [&]( const Event* event ) {
dialog->addEventListener( Event::OnWindowClose, [&]( const Event* ) {
if ( mEditorSplitter && mEditorSplitter->getCurEditor() &&
!SceneManager::instance()->isShootingDown() )
mEditorSplitter->getCurEditor()->setFocus();
} );
dialog->addEventListener( Event::OpenFile, [&, loadingMonoFont]( const Event* event ) {
auto newPath = event->getNode()->asType<UIFileDialog>()->getFullPath();
if ( String::startsWith( newPath, mResPath ) )
newPath = newPath.substr( mResPath.size() );
if ( fontPath != newPath ) {
fontPath = newPath;
if ( !loadingMonoFont )
return;
auto fontName =
FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( fontPath ) );
FontTrueType* fontMono = loadFont( fontName, fontPath );
@@ -207,11 +214,6 @@ void App::openFontDialog( std::string& fontPath ) {
}
}
} );
dialog->addEventListener( Event::OnWindowClose, [&]( const Event* ) {
if ( mEditorSplitter && mEditorSplitter->getCurEditor() &&
!SceneManager::instance()->isShootingDown() )
mEditorSplitter->getCurEditor()->setFocus();
} );
dialog->center();
dialog->show();
}
@@ -591,9 +593,9 @@ UIMenu* App::createWindowMenu() {
} );
setFocusEditorOnClose( msgBox );
} else if ( item->getText() == "Serif Font..." ) {
openFontDialog( mConfig.ui.serifFont );
openFontDialog( mConfig.ui.serifFont, false );
} else if ( item->getText() == "Monospace Font..." ) {
openFontDialog( mConfig.ui.monospaceFont );
openFontDialog( mConfig.ui.monospaceFont, true );
} else if ( "Zoom In" == item->getText() ) {
mEditorSplitter->zoomIn();
} else if ( "Zoom Out" == item->getText() ) {
@@ -2262,7 +2264,7 @@ void App::init( const std::string& file, const Float& pidelDensity,
background-color: #00000066;
}
#image_close {
color: #eff0f188;
color: var(--floating-icon);
font-family: icon;
font-size: 22dp;
margin-top: 32dp;