Avoid rendering plain text tooltips as rich text.

Rendering plain text tooltips as rich text can cause an unwanted
change in line breaks - for example, in the KOrn status tooltip.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 4 years ago
parent 7c9b3ae44b
commit 005d3c6f2b
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1676,21 +1676,32 @@ bool DominoStyle::objectEventHandler( const TQStyleControlElementData &ceData,
p.setClipping(false); p.setClipping(false);
TQColor tabContour2 = tqApp->palette().active().background().dark(150); TQColor tabContour2 = tqApp->palette().active().background().dark(150);
p.save();
p.setPen(tabContour2); p.setPen(tabContour2);
p.drawLine(x+7,y, w-8,y); // top p.drawLine(x+7,y, w-8,y); // top
p.drawLine(x+7,h-1, w-8,h-1); // bottom p.drawLine(x+7,h-1, w-8,h-1); // bottom
p.drawLine(x,y+7, x,h-8); // left p.drawLine(x,y+7, x,h-8); // left
p.drawLine(w-1,y+7, w-1,h-8); // right p.drawLine(w-1,y+7, w-1,h-8); // right
p.restore();
bitBlt(label, x, y, border1, 0, 0, 7, 7); bitBlt(label, x, y, border1, 0, 0, 7, 7);
bitBlt(label, w-7, y, border1, 7, 0, 7, 7); bitBlt(label, w-7, y, border1, 7, 0, 7, 7);
bitBlt(label, x, h-7, border1, 0, 7, 7, 7); bitBlt(label, x, h-7, border1, 0, 7, 7, 7);
bitBlt(label, w-7, h-7, border1, 7, 7, 7, 7); bitBlt(label, w-7, h-7, border1, 7, 7, 7, 7);
TQSimpleRichText* srt = new TQSimpleRichText(label->text(), label->font()); if(TQStyleSheet::mightBeRichText(label->text()))
srt->setWidth(r.width()-5); {
srt->draw(&p, r.x()+4, r.y(), r, tqApp->palette().active(),0); TQSimpleRichText* srt = new TQSimpleRichText(label->text(), label->font());
delete srt; srt->setWidth(r.width()-5);
srt->draw(&p, r.x()+4, r.y(), r, tqApp->palette().active(), 0);
delete srt;
}
else
{
r.addCoords(2, 3, 0, 0);
p.drawText(r, AlignAuto + AlignTop, label->text());
}
} }
return true; return true;
} }

Loading…
Cancel
Save