office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-12 20:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix embed mode detection

Browse source 
Wow, I have no idea how this happened. I wrote an big test case and spent a lot of time playing with tabs. Stephan Binner even told me about this a month ago, but I didn't quite understand the problem...
Broken embed mode detection means that the tabbed interface is disabled. It actually made it into release... ugh

REVIEW: 123680
This commit is contained in:
Jonathan Doman 2015-05-14 00:58:21 +02:00 committed by Albert Astals Cid
parent cb9aa1559d
commit 223092aa0e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/script/kjs_document.cpp
View file

@ -125,7 +125,7 @@ static KJSObject docGetExternal( KJSContext *, void *object )
const bool isShell = ( widget
&& widget->parentWidget()
&& widget->parentWidget()->objectName() == QLatin1String( "okular::Shell" ) );
&& widget->parentWidget()->objectName().startsWith( QLatin1String( "okular::Shell" ) ) );
return KJSBoolean( !isShell );
}

4
part.cpp
View file

@ -239,8 +239,8 @@ static Okular::EmbedMode detectEmbedMode( QWidget *parentWidget, QObject *parent
Q_UNUSED( parentWidget );
if ( parent
&& ( parent->objectName() == QLatin1String( "okular::Shell" )
|| parent->objectName() == QLatin1String( "okular/okular__Shell" ) ) )
&& ( parent->objectName().startsWith( QLatin1String( "okular::Shell" ) )
|| parent->objectName().startsWith( QLatin1String( "okular/okular__Shell" ) ) ) )
return Okular::NativeShellMode;
if ( parent