aboutsummaryrefslogtreecommitdiff
path: root/dw/image.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-05-30 22:29:19 +0200
committerSebastian Geerken <devnull@localhost>2014-05-30 22:29:19 +0200
commitd5500ed25bcb5140ec285bbd87dc1c04638e93ba (patch)
treecfe20c97f06f4fd2696f60733ec39855daf32117 /dw/image.cc
parentd83834b8684ab3e6143de2ac128b46f4d76492a1 (diff)
Simplified Textblock::calcWidgetSize. Work on Image::sizeRequestImpl.
Diffstat (limited to 'dw/image.cc')
-rw-r--r--dw/image.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/dw/image.cc b/dw/image.cc
index e71c8f2f..f0a6827c 100644
--- a/dw/image.cc
+++ b/dw/image.cc
@@ -170,6 +170,9 @@ Image::~Image()
void Image::sizeRequestImpl (core::Requisition *requisition)
{
+ DBG_OBJ_MSG ("resize", 0, "<b>sizeRequestImpl</b> ()");
+ DBG_OBJ_MSG_START ();
+
if (buffer) {
if (getStyle ()->height == core::style::LENGTH_AUTO &&
core::style::isAbsLength (getStyle ()->width) &&
@@ -209,6 +212,12 @@ void Image::sizeRequestImpl (core::Requisition *requisition)
requisition->width += getStyle()->boxDiffWidth ();
requisition->ascent += getStyle()->boxOffsetY ();
requisition->descent += getStyle()->boxRestHeight ();
+
+ correctRequisition (requisition, core::splitHeightPreserveDescent);
+
+ DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+ requisition->width, requisition->ascent, requisition->descent);
+ DBG_OBJ_MSG_END ();
}
void Image::sizeAllocateImpl (core::Allocation *allocation)