From d137ca89698eda33bcce7a29b6a69d2b51b66180 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 21 Nov 2016 10:43:27 +0100 Subject: [PATCH] CComponentsFrmClock: ensure that no radius is defined for inner items Radius is not required for inner segments. TODO: single segment Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/02c6df782c0b423f05e248935db40395fc12e8a7 Author: Thilo Graf Date: 2016-11-21 (Mon, 21 Nov 2016) --- src/gui/components/cc_frm_clock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp index 82c048943..5adcd7b45 100644 --- a/src/gui/components/cc_frm_clock.cpp +++ b/src/gui/components/cc_frm_clock.cpp @@ -190,8 +190,8 @@ void CComponentsFrmClock::initCCLockItems() //background paint of item is not required lbl->doPaintBg(false); - //set corner properties of label item - lbl->setCorner(corner_rad-fr_thickness, corner_type); + //preset corner properties of label item + lbl->setCorner(max(0, corner_rad-fr_thickness), corner_type); //set text border to 0 lbl->setTextBorderWidth(0,0); @@ -234,7 +234,7 @@ void CComponentsFrmClock::initCCLockItems() else if (i == v_cc_items.size()-1) lbl->setCornerType(corner_type & CORNER_RIGHT);// last label item else - lbl->setCornerType(0);// inner items + lbl->setCorner(0,CORNER_NONE);// inner items don't need round corners } //extract timestring segment (char)