Class library: Button class and ButtonGroup class for DISCO-F746NG. クラスライブラリ: DISCO-F746NG 用の,Button クラス,ButtonGroup クラス.
Dependents: F746_SpectralAnalysis_NoPhoto F746_Fourier_series_of_square_wave_01 F746_ButtonGroup_Demo F746_Mandelbrot ... more
Diff: button.hpp
- Revision:
- 5:2cc388e91bde
- Parent:
- 4:543ec60c2814
- Child:
- 8:479ed9f0ba20
--- a/button.hpp Sat Dec 05 11:09:29 2015 +0000 +++ b/button.hpp Tue Dec 08 14:19:41 2015 +0000 @@ -1,7 +1,7 @@ //----------------------------------------------------------- // Button class -- Header // -// 2015/12/05, Copyright (c) 2015 MIKAMI, Naoki +// 2015/12/08, Copyright (c) 2015 MIKAMI, Naoki //----------------------------------------------------------- #ifndef F746_BUTTON_HPP @@ -24,8 +24,9 @@ const string str = "", sFONT &fonts = Font12, uint32_t textColor = LCD_COLOR_WHITE) : lcd_(lcd), ts_(ts), X_(x), Y_(y), W_(width), H_(height), - ORIGINAL_COLOR_(color), BACK_COLOR_(backColor), - STR_(str), FONTS_(&fonts) + ORIGINAL_COLOR_(color), BACK_COLOR_(backColor), + STR_(str), FONTS_(&fonts), FONT_WIDTH_(fonts.Width), + FONT_HEIGHT_(fonts.Height) { Draw(color, textColor); } // Draw button @@ -55,10 +56,12 @@ LCD_DISCO_F746NG &lcd_; TS_DISCO_F746NG &ts_; const uint16_t X_, Y_, W_, H_; - const uint32_t ORIGINAL_COLOR_; // original color + const uint32_t ORIGINAL_COLOR_; // original color const uint32_t BACK_COLOR_; // back color of screen const string STR_; sFONT *const FONTS_; + const uint16_t FONT_WIDTH_; + const uint16_t FONT_HEIGHT_; uint32_t currentColor_; @@ -69,4 +72,3 @@ } #endif // F746_BUTTON_HPP -