Skip to content

Commit 8df7a03

Browse files
authored
Fix ukrainian fonts (#5468)
* FIX: rollback to !4624 * UPDATE: new 16 and 24 UA Fonts and fixes
1 parent b00c050 commit 8df7a03

File tree

6 files changed

+1645
-135
lines changed

6 files changed

+1645
-135
lines changed

src/graphics/Screen.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
2121
*/
2222
#include "Screen.h"
23-
#include "../userPrefs.h"
2423
#include "PowerMon.h"
2524
#include "Throttle.h"
2625
#include "configuration.h"
@@ -2757,4 +2756,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
27572756
} // namespace graphics
27582757
#else
27592758
graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
2760-
#endif // HAS_SCREEN
2759+
#endif // HAS_SCREEN

src/graphics/Screen.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "../userPrefs.h"
34
#include "configuration.h"
45

56
#include "detect/ScanI2C.h"

src/graphics/ScreenFonts.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,22 @@
2727
#define FONT_SMALL ArialMT_Plain_10_RU
2828
#else
2929
#ifdef OLED_UA
30-
#define FONT_SMALL ArialMT_Plain_10_UA
30+
#define FONT_SMALL ArialMT_Plain_10_UA // Height: 13
3131
#else
3232
#define FONT_SMALL ArialMT_Plain_10 // Height: 13
3333
#endif
3434
#endif
3535
#endif
36+
#ifdef OLED_UA
37+
#define FONT_MEDIUM ArialMT_Plain_16_UA // Height: 19
38+
#else
3639
#define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
37-
#define FONT_LARGE ArialMT_Plain_24 // Height: 28
40+
#endif
41+
#ifdef OLED_UA
42+
#define FONT_LARGE ArialMT_Plain_24_UA // Height: 28
43+
#else
44+
#define FONT_LARGE ArialMT_Plain_24 // Height: 28
45+
#endif
3846
#endif
3947

4048
#define _fontHeight(font) ((font)[1] + 1) // height is position 1

0 commit comments

Comments
 (0)