v0.1.10

lovyan03 · May 26, 2020 · 7509d32 · 7509d32
1 parent 143d3ae
commit 7509d32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -182,7 +182,9 @@ void setup(void)
   lcd.drawCircle ( 40, 80, 20    );        // 青色で円の外周
   lcd.drawEllipse( 80, 40, 10, 20);        // 青色で楕円の外周
   lcd.drawArc    ( 80, 80, 20, 10, 0, 90); // 青色で円弧の外周
-  lcd.drawTriangle(80, 80, 60, 80, 80, 60);// 青色で三角の外周
+  lcd.drawTriangle(60, 80, 80, 80, 80, 60);// 青色で三角の外周
+  lcd.setColor(0x00FF00U);                 // 緑色を指定
+  lcd.drawBezier(  60, 80, 80, 80, 80, 60);// 緑色でベジエ曲線
 
 
 // SPIバスの確保と解放は描画関数を呼び出した時に自動的に行われます。

diff --git a/examples/HowToUse/1_simple_use/1_simple_use.ino b/examples/HowToUse/1_simple_use/1_simple_use.ino
@@ -123,7 +123,9 @@ void setup(void)
   lcd.drawCircle ( 40, 80, 20    );        // 青色で円の外周
   lcd.drawEllipse( 80, 40, 10, 20);        // 青色で楕円の外周
   lcd.drawArc    ( 80, 80, 20, 10, 0, 90); // 青色で円弧の外周
-  lcd.drawTriangle(80, 80, 60, 80, 80, 60);// 青色で三角の外周
+  lcd.drawTriangle(60, 80, 80, 80, 80, 60);// 青色で三角の外周
+  lcd.setColor(0x00FF00U);                 // 緑色を指定
+  lcd.drawBezier(  60, 80, 80, 80, 80, 60);// 緑色でベジエ曲線
 
 
 // SPIバスの確保と解放は描画関数を呼び出した時に自動的に行われます。

diff --git a/library.json b/library.json
@@ -1,7 +1,7 @@
 {
   "name": "LovyanGFX",
-  "description": "LCD Graphics driver",
-  "keywords": "LCD, TFT, GFX, LGFX, m5stack, esp32, wioterminal",
+  "description": "LCD Graphics driver for ESP32 and SAMD51",
+  "keywords": "LCD, TFT, GFX, LGFX, M5Stack, esp32, WioTerminal, ODROID-GO, TTGO T-Watch, ESP-WROVER-KIT, WioTerminal, HX8357, ILI9163, ILI9342, ILI9341, ILI9486, ILI9488, ST7735, ST7789, SSD1351",
   "authors": {
     "name": "lovyan03",
     "url": "https://github.com/lovyan03",
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/lovyan03/LovyanGFX"
   },
-  "version": "0.1.9",
+  "version": "0.1.10",
   "framework": "arduino",
   "platforms": "espressif32, atmelsam",
   "build": {

diff --git a/library.properties b/library.properties
@@ -1,8 +1,8 @@
 name=LovyanGFX
-version=0.1.9
+version=0.1.10
 author=lovyan03
 maintainer=Lovyan <42724151+lovyan03@users.noreply.github.com>
-sentence=LGFX LCD Graphics driver for ESP32 and SAMD51
+sentence=LCD Graphics driver for ESP32 and SAMD51
 paragraph=Supports LCD displays using drivers that operate with hardware SPI. ESP32, SAMD51(Seeeduino), M5Stack, ODROID-GO, TTGO T-Watch, ESP-WROVER-KIT, WioTerminal, HX8357, ILI9163, ILI9342, ILI9341, ILI9486, ILI9488, ST7735, ST7789, SSD1351
 category=Display
 url=https://github.com/lovyan03/LovyanGFX

diff --git a/src/lgfx/lgfx_font_support.hpp b/src/lgfx/lgfx_font_support.hpp
@@ -245,7 +245,7 @@ namespace lgfx
     void setTextDatum(textdatum_t datum) { _text_style.datum = datum; }
     [[deprecated("use textdatum_t")]]
     void setTextDatum(std::uint8_t datum) { _text_style.datum = (textdatum_t)datum; }
-    void setTextPadding(std::uint16_t padding_x) { _padding_x = padding_x; }
+    void setTextPadding(std::uint32_t padding_x) { _padding_x = padding_x; }
     void setTextWrap( bool wrapX, bool wrapY = false) { _textwrap_x = wrapX; _textwrap_y = wrapY; }
     void setTextScroll(bool scroll) { _textscroll = scroll; if (_cursor_x < this->_sx) { _cursor_x = this->_sx; } if (_cursor_y < this->_sy) { _cursor_y = this->_sy; } }
 
@@ -744,6 +744,7 @@ namespace lgfx
     std::int32_t _cursor_x = 0;
     std::int32_t _cursor_y = 0;
     std::int32_t _filled_x = 0;
+    std::int32_t _padding_x = 0;
 
     TextStyle _text_style;
     FontMetrics _font_metrics = { 6, 6, 0, 8, 8, 0, 7 }; // Font0 Metric
@@ -753,8 +754,6 @@ namespace lgfx
     FileWrapper _font_file;
     PointerWrapper _font_data;
 
-    std::int16_t _padding_x = 0;
-
     bool _textwrap_x = true;
     bool _textwrap_y = false;
     bool _textscroll = false;