Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-19 20:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Try fix macOS not passing tests due to incorrect Window sizing in macOS CI.

Browse Source 
Add support to diff images in UIDiffView.
This commit is contained in:
Martín Lucas Golini
2026-05-23 14:17:48 -03:00
parent 15db9e90eb
commit 89028491ef
16 changed files with 609 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/ecode/ecode.cpp
+7 -3
View File
@@ -2637,14 +2637,15 @@ void App::loadAudioFromPath( const std::string& path, bool autoPlay ) {
audioPlayer->loadFromPath( path, autoPlay );
}
void App::loadDiffFromMemory( const std::string& content, const std::string& originalFilePath ) {
void App::loadDiffFromMemory( const std::string& content, const std::string& originalFilePath,
const std::string& oldFilePath, const std::string& repoPath ) {
if ( UIDiffView::isMultiFileDiff( content ) ) {
auto diffViewTitle = i18n( "diff_viewer", "Diff Viewer" ) + ": " + originalFilePath;
UIIcon* icon = getUISceneNode()->findIcon( "filetype-diff" );
if ( !icon )
icon = getUISceneNode()->findIcon( "file" );
auto scrollView = UIDiffView::NewMultiFileDiffViewer( content );
auto scrollView = UIDiffView::NewMultiFileDiffViewer( content, repoPath );
auto [tab, iv] = getSplitter()->createWidget( scrollView, diffViewTitle );
if ( icon )
tab->setIcon( icon->getSize( getMenuIconSize() ) );
@@ -2662,7 +2663,10 @@ void App::loadDiffFromMemory( const std::string& content, const std::string& ori
auto diffViewTitle = i18n( "diff_viewer", "Diff Viewer" );
auto* diffView = Tools::UIDiffView::New();
diffView->setAutoDeleteOldTempImage( true );
auto [tab, iv] = getSplitter()->createWidget( diffView, diffViewTitle );
if ( !tab )
return;
if ( !originalFilePath.empty() ) {
std::string fileName = FileSystem::fileNameFromPath( originalFilePath );
tab->setText( diffViewTitle + ": " + fileName );
@@ -2676,7 +2680,7 @@ void App::loadDiffFromMemory( const std::string& content, const std::string& ori
if ( icon )
tab->setIcon( icon->getSize( getMenuIconSize() ) );
diffView->setHeadersVisible( true );
diffView->loadFromPatch( content, originalFilePath );
diffView->loadFromPatch( content, originalFilePath, oldFilePath );
diffView->setSyntaxColorScheme( *getCurrentColorScheme() );
registerUnlockedCommands( *diffView );
}