From d94fb5dd63c384a7a2d74728db9fb118183c35e2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 16 Apr 2016 19:12:30 +1000 Subject: [PATCH] Fixed display of single control modules in tdecmshell. This was a regression introduced in commit 5117798 three years ago. After reverting the related part, I have tested at length and not found any problem, so it seems safe enough to push the old code back. Signed-off-by: Michele Calgaro (cherry picked from commit dfd961b2b9ee29c7ca05c4e288cdeaaff9b2d6e8) --- tdecmshell/main.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index 9ca169c2f..20ef629d9 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -285,12 +285,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) return 0; } - //KDialogBase::DialogType dtype = KDialogBase::Plain; // FIXME - KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode - if ( args->isSet( "embed-proxy" ) || args->isSet( "embed" ) ) { // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );] - dtype = KDialogBase::Plain; // In fact, this method of display may be preferable to the Plain mode from a UX perspective, - } // as the icon shows the user what the active kcontrol module is called. - + KDialogBase::DialogType dtype = KDialogBase::Plain; if ( modules.count() < 1 ) return 0; else if( modules.count() > 1 )