diff --git a/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png b/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png new file mode 100644 index 0000000000..fae305f37f Binary files /dev/null and b/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png differ diff --git a/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png b/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png new file mode 100644 index 0000000000..0ed3c843c3 Binary files /dev/null and b/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png differ diff --git a/Themes/_fallback/Fonts/frutiger 24px.ini b/Themes/_fallback/Fonts/frutiger 24px.ini index 702c8cd9cd..988bc39672 100644 --- a/Themes/_fallback/Fonts/frutiger 24px.ini +++ b/Themes/_fallback/Fonts/frutiger 24px.ini @@ -261,6 +261,7 @@ AdvanceExtraPixels=0 253=12 254=15 255=12 + [alt] 0=10 1=10 @@ -390,3 +391,28 @@ AdvanceExtraPixels=0 125=12 126=6 127=7 + +[polish] +Baseline=23 +Top=6 + +line 0=ĄĆĘŁŃŚŹŻ +line 1=ąćęłńśźż + +0=15 +1=10 +2=12 +3=12 +4=12 +5=12 +6=13 +7=13 + +8=11 +9=11 +10=11 +11=6 +12=11 +13=10 +14=10 +15=10 \ No newline at end of file diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2ef2b0104c..84f42d7af3 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1236,6 +1236,7 @@ Write Profiles=Write Profiles off=off on=on or=or +Zoom In Camera=Zoom In Camera [ScreenEdit] %s notes=%s notes diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp index dd8a50b27b..e921fb98e2 100644 --- a/src/ScreenDebugOverlay.cpp +++ b/src/ScreenDebugOverlay.cpp @@ -569,6 +569,7 @@ static LocalizedString WRITE_PREFERENCES ( "ScreenDebugOverlay", "Write Preferen static LocalizedString MENU_TIMER ( "ScreenDebugOverlay", "Menu Timer" ); static LocalizedString FLUSH_LOG ( "ScreenDebugOverlay", "Flush Log" ); static LocalizedString PULL_BACK_CAMERA ( "ScreenDebugOverlay", "Pull Back Camera" ); +static LocalizedString ZOOM_IN_CAMERA ( "ScreenDebugOverlay", "Zoom In Camera" ); static LocalizedString VISUAL_DELAY_UP ( "ScreenDebugOverlay", "Visual Delay Up" ); static LocalizedString VISUAL_DELAY_DOWN ( "ScreenDebugOverlay", "Visual Delay Down" ); static LocalizedString VOLUME_UP ( "ScreenDebugOverlay", "Volume Up" ); @@ -1101,7 +1102,7 @@ class DebugLinePullBackCamera : public IDebugLine { virtual RString GetDisplayTitle() { return PULL_BACK_CAMERA.GetValue(); } virtual RString GetDisplayValue() { return RString(); } - virtual bool IsEnabled() { return g_fImageScaleDestination != 1; } + virtual bool IsEnabled() { return g_fImageScaleDestination < 1.0f; } virtual void DoAndLog( RString &sMessageOut ) { if( g_fImageScaleDestination == 1 ) @@ -1112,6 +1113,21 @@ class DebugLinePullBackCamera : public IDebugLine } }; +class DebugLineZoomInCamera : public IDebugLine +{ + virtual RString GetDisplayTitle() { return ZOOM_IN_CAMERA.GetValue(); } + virtual RString GetDisplayValue() { return RString(); } + virtual bool IsEnabled() { return g_fImageScaleDestination > 1.0f; } + virtual void DoAndLog( RString &sMessageOut ) + { + if( g_fImageScaleDestination == 1 ) + g_fImageScaleDestination = 2.0f; + else + g_fImageScaleDestination = 1; + IDebugLine::DoAndLog( sMessageOut ); + } +}; + class DebugLineVolumeUp : public IDebugLine { virtual RString GetDisplayTitle() { return VOLUME_UP.GetValue(); } @@ -1226,6 +1242,7 @@ DECLARE_ONE( DebugLineWritePreferences ); DECLARE_ONE( DebugLineMenuTimer ); DECLARE_ONE( DebugLineFlushLog ); DECLARE_ONE( DebugLinePullBackCamera ); +DECLARE_ONE( DebugLineZoomInCamera ); DECLARE_ONE( DebugLineVolumeUp ); DECLARE_ONE( DebugLineVolumeDown ); DECLARE_ONE( DebugLineVisualDelayUp );