cc_types: move struct button_label_cc into cc_types.h

Origin commit data
------------------
Commit: e777ecdfdb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
This commit is contained in:
2017-03-13 09:45:38 +01:00
parent e23f4e1db5
commit fbe5200b0c
2 changed files with 15 additions and 13 deletions

View File

@@ -29,19 +29,6 @@
#include <global.h> #include <global.h>
#include <gui/widget/buttons.h> //for compatibility with 'button_label' type #include <gui/widget/buttons.h> //for compatibility with 'button_label' type
//for 'button_label' type with string
typedef struct button_label_cc
{
const char * button;
std::string text;
neutrino_locale_t locale;
neutrino_msg_t directKey;
neutrino_msg_t directKeyAlt;
int btn_result;
int btn_alias;
std::string bg_image;
button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){}
} button_label_cc_struct;
/*! /*!
CComponentsFooter, sub class of CComponentsHeader provides prepared container for footer CComponentsFooter, sub class of CComponentsHeader provides prepared container for footer

View File

@@ -175,6 +175,21 @@ typedef struct cc_string_ext_txt_t
Font* font; Font* font;
} cc_string_ext_txt_struct_t; } cc_string_ext_txt_struct_t;
//for 'button_label' type with string
typedef struct button_label_cc
{
const char * button;
std::string text;
neutrino_locale_t locale;
neutrino_msg_t directKey;
neutrino_msg_t directKeyAlt;
int btn_result;
int btn_alias;
std::string bg_image;
button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){}
} button_label_cc_struct;
#define CC_WIDTH_MIN 16 #define CC_WIDTH_MIN 16
#define CC_HEIGHT_MIN 16 #define CC_HEIGHT_MIN 16