← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to krita/ui/widgets/kis_iconwidget.cc

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/ui/widgets/kis_iconwidget.cc
44
44
    qint32 cw = width();
45
45
    qint32 ch = height();
46
46
    if (m_resource) {
47
 
        p.drawImage(QRect(0, 0, 24, 24), m_resource->img());
 
47
        p.drawImage(QRect(0, 0, 24, 24), m_resource->image());
48
48
    } else {
49
49
        p.fillRect(0, 0, cw, ch, Qt::white);
50
50
    }
51
51
    p.setPen(Qt::gray);
52
52
    p.drawRect(0, 0, cw + 1, ch + 1);
 
53
    (void)p.end();
53
54
    paintPopupArrow();
54
55
}
55
56