From e6f2a6080aecd8239d7ce5bbd2329490adb8f20b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 14 Aug 2016 20:56:41 +0200 Subject: [PATCH] cc_frm_button: don't use frames per default and align fontsize to familiar size Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fa27f87bb13c99d989041b4a57e14f1ac925831d Author: vanhofen Date: 2016-08-14 (Sun, 14 Aug 2016) Origin message was: ------------------ - cc_frm_button: don't use frames per default and align fontsize to familiar size --- src/gui/components/cc_frm_button.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index ee7b4a23d..da7a575d8 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -110,7 +110,7 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const cc_item_enabled = enabled; cc_item_selected = selected; - fr_thickness = 3; //TODO: parts of the GUI still don't use framed buttons + fr_thickness = 0; //TODO: parts of the GUI still don't use framed buttons append_x_offset = 6; append_y_offset = 0; corner_rad = 0; @@ -192,7 +192,7 @@ void CComponentsButton::initCaption() x_cap += cc_btn_icon_obj ? cc_btn_icon_obj->getWidth() : 0; int w_cap = width - fr_thickness - append_x_offset - x_cap - fr_thickness; - int h_cap = height*85/100/* - 2*fr_thickness*/; + int h_cap = height*65/100 /*- 2*fr_thickness*/; /*NOTE: paint of centered text in y direction without y_offset