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

« back to all changes in this revision

Viewing changes to plasma/desktop/applets/tasks/taskitemlayout.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christian Mangold
  • Date: 2011-04-03 16:54:55 UTC
  • mfrom: (1.1.55 upstream)
  • Revision ID: james.westby@ubuntu.com-20110403165455-8tnwxt82p21p15hh
Tags: 4:4.6.2a-0ubuntu1
* New upstream release
  - Update kde-sc-dev-latest version
  - Update kdebase-workspace-wallpapers.install,
    kde-window-manager.install and not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
344
344
                setRowMaximumHeight(row, maximumCellSize.height());
345
345
                setColumnMaximumWidth(col, QWIDGETSIZE_MAX);
346
346
            } else {
347
 
                if (item->abstractItem()->itemType() == TaskManager::LauncherItemType) {
 
347
                if (item->abstractItem() && item->abstractItem()->itemType() == TaskManager::LauncherItemType) {
348
348
                    setColumnFixedWidth(col, maximumCellSize.height()); //The Icon size is a sqare, so it needs the same width as height
349
349
                } else {
350
350
                    setColumnMaximumWidth(col, maximumCellSize.width());