From bf987b74781d97db34448cd60556e50827ec20da Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 4 Nov 2016 16:46:47 +0100 Subject: [PATCH 1/2] - cablex.xml: update Unitymedia; thx to klauser --- data/cables.xml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/data/cables.xml b/data/cables.xml index debbe767f..4970d600c 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -220,11 +220,10 @@ - - - - - + + + + @@ -245,32 +244,27 @@ + + + + - - - - - - - - - - - - - - + + - + + + + From 90a693a1ec9f588d7d42362e4b393574e2682a13 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 4 Nov 2016 23:56:29 +0100 Subject: [PATCH 2/2] CComponentsInfoBox: fix missing calculation of image position with parent --- src/gui/components/cc_item_infobox.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp index 4d3f785e9..a2a6b6cbb 100644 --- a/src/gui/components/cc_item_infobox.cpp +++ b/src/gui/components/cc_item_infobox.cpp @@ -105,8 +105,12 @@ void CComponentsInfoBox::paintPicture() if (pic_name.empty()) return; + //NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item + int x_pic = (cc_parent ? cc_xr : x) + fr_thickness; + int y_pic = (cc_parent ? cc_yr : y) + fr_thickness; + //init pic object and set icon paint position - pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale! + pic = new CComponentsPicture(x_pic+x_offset, y_pic, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale! pic->setColorBody(col_body); @@ -115,7 +119,7 @@ void CComponentsInfoBox::paintPicture() pic->doPaintBg(false); //fit icon into frame - pic->setYPos(y+(height/2-pic->getHeight()/2)); + pic->setYPos(y_pic+(height/2-pic->getHeight()/2)); //paint, but set visibility mode pic->allowPaint(cc_allow_paint);