← Back to branch summary

~ubuntu-branches/ubuntu/natty/kdebase-workspace/natty-security

« back to all changes in this revision

Viewing changes to plasma/desktop/shell/panelcontroller.cpp

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2011-11-08 17:43:28 UTC
  • mfrom: (283.1.3 natty-proposed)
  • Revision ID: package-import@ubuntu.com-20111108174328-pliqi8vxqr7cqpgf
Tags: 4:4.6.5-0ubuntu1.1
* No change rebuild for security. This is needed to build kdeutils in
  the security pocket.
* debian/control: relax build-dependency on kde-sc-dev-latest so this
  is actually buildable in the security PPA

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/desktop/shell/panelcontroller.cpp
309
309
    ControllerWindow::moveEvent(event);
310
310
}
311
311
 
 
312
void PanelController::showEvent(QShowEvent *event)
 
313
{
 
314
    if (containment()) {
 
315
        setMaximumSize(PlasmaApp::self()->corona()->screenGeometry(containment()->screen()).size());
 
316
        syncToLocation();
 
317
    }
 
318
    ControllerWindow::showEvent(event);
 
319
}
 
320
 
312
321
void PanelController::setLocation(const Plasma::Location &loc)
313
322
{
314
323
    if (location() == loc) {
408
417
    updateGeometry();
409
418
 
410
419
    setMinimumSize(QSize(0, 0));
411
 
    setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
 
420
    setMaximumSize(sizeHint());
412
421
    resize(sizeHint());
413
422
}
414
423