summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering/render_line.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-02 18:38:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-02 18:40:04 -0500
commitcc5fd88be313142d3996c81f8bdfc1290485858c (patch)
tree36c6e1eef900d0ef1aa05e96d786194b4c5674d9 /tdehtml/rendering/render_line.h
parent2c850d93a7803e435504fe9c982cb974695d7a3b (diff)
downloadtdelibs-cc5fd88be313142d3996c81f8bdfc1290485858c.tar.gz
tdelibs-cc5fd88be313142d3996c81f8bdfc1290485858c.zip
Don't use insane (negative) layout values if layout engine does not allocate sufficient space for a text string
This resolves Bug 1950 Make most debugging statements work again Add new debugging statements Fix several annoying build warnings
Diffstat (limited to 'tdehtml/rendering/render_line.h')
-rw-r--r--tdehtml/rendering/render_line.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/tdehtml/rendering/render_line.h b/tdehtml/rendering/render_line.h
index 3dc066e10..8d4c8a256 100644
--- a/tdehtml/rendering/render_line.h
+++ b/tdehtml/rendering/render_line.h
@@ -84,7 +84,15 @@ public:
RootInlineBox* root();
- void setWidth(short w) { m_width = w; }
+ void setWidth(short w) {
+ if (w < 0) {
+ m_width = SHRT_MAX;
+ kdDebug( 6040 ) << " InlineBox::setWidth() invalid negative width " << w << " specified!" << endl;
+ }
+ else {
+ m_width = w;
+ }
+ }
short width() const { return m_width; }
void setXPos(short x) { m_x = x; }