Fix double margins

svn path=/trunk/KDE/kdebase/workspace/; revision=999968
icc-effect-5.14.5
Christoph Feck 2009-07-20 17:18:02 +00:00
parent d8a42df991
commit 92edeb1fe4
4 changed files with 5 additions and 9 deletions

View File

@ -35,6 +35,7 @@ DesktopNamesWidget::DesktopNamesWidget( QWidget *parent )
, m_maxDesktops( 0 ) , m_maxDesktops( 0 )
{ {
m_namesLayout = new QGridLayout; m_namesLayout = new QGridLayout;
m_namesLayout->setMargin( 0 );
setLayout( m_namesLayout ); setLayout( m_namesLayout );
} }

View File

@ -65,6 +65,7 @@ void KWinDesktopConfig::init()
// TODO: there has to be a way to add the shortcuts editor to the ui file // TODO: there has to be a way to add the shortcuts editor to the ui file
m_editor = new KShortcutsEditor( m_ui, KShortcutsEditor::GlobalAction ); m_editor = new KShortcutsEditor( m_ui, KShortcutsEditor::GlobalAction );
m_ui->editorFrame->setLayout( new QVBoxLayout() ); m_ui->editorFrame->setLayout( new QVBoxLayout() );
m_ui->editorFrame->layout()->setMargin( 0 );
m_ui->editorFrame->layout()->addWidget( m_editor ); m_ui->editorFrame->layout()->addWidget( m_editor );
m_ui->desktopNames->setDesktopConfig( this ); m_ui->desktopNames->setDesktopConfig( this );

View File

@ -2,15 +2,10 @@
<ui version="4.0"> <ui version="4.0">
<class>KWinDesktopConfigForm</class> <class>KWinDesktopConfigForm</class>
<widget class="QWidget" name="KWinDesktopConfigForm"> <widget class="QWidget" name="KWinDesktopConfigForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>724</width>
<height>434</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">

View File

@ -741,7 +741,6 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
" a window while pressing a modifier key.")); " a window while pressing a modifier key."));
QHBoxLayout* innerLay=new QHBoxLayout(box); QHBoxLayout* innerLay=new QHBoxLayout(box);
innerLay->setMargin(0);
QHBoxLayout* fLay=new QHBoxLayout; QHBoxLayout* fLay=new QHBoxLayout;
gridLayout = new QGridLayout; gridLayout = new QGridLayout;
innerLay->addLayout(fLay); innerLay->addLayout(fLay);