From ace6e896dd7cc979f7c6df6bbfa07ab8d6be92fc Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 1 Jun 2014 22:27:42 +0200 Subject: [PATCH] CComponents: fix screen rests Frame of painted box was incomplete removed, eg hint box see also: http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/12230-r%C3%BCckst%C3%A4nde-auf-bildschirm-bei-apollo/ Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f74a0009299d0d9d3db3a7153ce5d2dc686dfb20 Author: Thilo Graf Date: 2014-06-01 (Sun, 01 Jun 2014) ------------------ This commit was generated by Migit --- src/gui/components/cc_base.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp index bffb827dc..22b06f7f8 100644 --- a/src/gui/components/cc_base.cpp +++ b/src/gui/components/cc_base.cpp @@ -237,7 +237,23 @@ void CComponents::kill(const fb_pixel_t& bg_color, const int& corner_radius) int r = v_fbdata[i].r; if (corner_radius > -1) r = corner_radius; - frameBuffer->paintBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, bg_color, r, corner_type); + frameBuffer->paintBoxRel(v_fbdata[i].x, + v_fbdata[i].y, + v_fbdata[i].dx, + v_fbdata[i].dy, + bg_color, + r, + corner_type); + if (v_fbdata[i].frame_thickness) + frameBuffer->paintBoxFrame(v_fbdata[i].x, + v_fbdata[i].y, + v_fbdata[i].dx, + v_fbdata[i].dy, + v_fbdata[i].frame_thickness, + bg_color, + r, + corner_type); + #if 0 else frameBuffer->paintBackgroundBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy);