mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
cc_form_header: add max caption width
picked from: https://github.com/TangoCash/neutrino-mp-cst-next
commit: 4ff6c9f89b194c5fffdc4ee4e4eb744829be975f
Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
Origin commit data
------------------
Commit: c482dd139f
Author: TangoCash <eric@loxat.de>
Date: 2017-05-01 (Mon, 01 May 2017)
Origin message was:
------------------
-cc_form_header: add max caption width
picked from: https://github.com/TangoCash/neutrino-mp-cst-next
commit: 4ff6c9f89b194c5fffdc4ee4e4eb744829be975f
Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
This commit is contained in:
@@ -144,6 +144,8 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
|
|||||||
cch_cl_sec_format = cch_cl_format;
|
cch_cl_sec_format = cch_cl_format;
|
||||||
cch_cl_enable_run = false;
|
cch_cl_enable_run = false;
|
||||||
|
|
||||||
|
cch_text_max_w = width;
|
||||||
|
|
||||||
addContextButton(buttons);
|
addContextButton(buttons);
|
||||||
initCCItems();
|
initCCItems();
|
||||||
initParent(parent);
|
initParent(parent);
|
||||||
@@ -562,6 +564,7 @@ void CComponentsHeader::initCaption()
|
|||||||
cch_cl_obj->allowPaint(cch_cl_enable);
|
cch_cl_obj->allowPaint(cch_cl_enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cc_text_w = min(cc_text_w,cch_text_max_w);
|
||||||
|
|
||||||
//create cch_text_obj and add to collection
|
//create cch_text_obj and add to collection
|
||||||
if (cch_text_obj == NULL){
|
if (cch_text_obj == NULL){
|
||||||
|
@@ -106,6 +106,8 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
|
|||||||
int cch_icon_w;
|
int cch_icon_w;
|
||||||
///property: internal width for clock object
|
///property: internal width for clock object
|
||||||
int cch_clock_w;
|
int cch_clock_w;
|
||||||
|
///property: internal max width for text object
|
||||||
|
int cch_text_max_w;
|
||||||
///property: internal x-position for caption object
|
///property: internal x-position for caption object
|
||||||
int cch_text_x;
|
int cch_text_x;
|
||||||
///property: internal offset of context button icons within context button object
|
///property: internal offset of context button icons within context button object
|
||||||
@@ -191,6 +193,8 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
|
|||||||
virtual Font* getCaptionFont(){return cch_font;}
|
virtual Font* getCaptionFont(){return cch_font;}
|
||||||
///set text color for caption
|
///set text color for caption
|
||||||
virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;}
|
virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;}
|
||||||
|
///set max width for caption
|
||||||
|
virtual void setCaptionMaxWidth(int max_width){cch_text_max_w = max_width;}
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user