Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add German language support for Virtual Keyboard #9608

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add German language support for Virtual Keyboard #9608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7845bd
Add German language support for Virtual Keyboard
roman-yagodin Mar 6, 2025
8c608ae
Draw German "Eszett" letter on button
roman-yagodin Mar 9, 2025
9252ee4
Update copyright year
roman-yagodin Mar 9, 2025
6bc826d
Merge branch 'master' into pr/9608
ihhub Mar 21, 2025
60758a0
Merge branch 'master' into issue-8826-de
zenseii Mar 21, 2025
ec4e6c8
Reduce the width of the eszett button symbol
zenseii Mar 21, 2025
6705835
Reduce both eszett letter and picture width by 1px to center properly
roman-yagodin Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/fheroes2/gui/ui_font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5868,7 +5868,23 @@ namespace
fheroes2::Copy( released[85 - 32], 0, 0, released[220 - 32], 0, 2, released[85 - 32].width(), released[85 - 32].height() );
fheroes2::SetPixel( released[220 - 32], offset + 4, offset + 0, buttonGoodReleasedColor );
fheroes2::SetPixel( released[220 - 32], offset + 8, offset + 0, buttonGoodReleasedColor );

// Eszett.
released[223 - 32].resize( 12 + offset * 2, 10 + offset * 2 );
released[223 - 32].reset();
fheroes2::DrawLine( released[223 - 32], { offset + 0, offset + 9 }, { offset + 2, offset + 9 }, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 2, offset + 9 }, { offset + 2, offset + 2 }, buttonGoodReleasedColor );
fheroes2::SetPixel( released[223 - 32], offset + 3, offset + 1, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 4, offset + 0 }, { offset + 10, offset + 0 }, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 11, offset + 1 }, { offset + 11, offset + 2 }, buttonGoodReleasedColor );
fheroes2::SetPixel( released[223 - 32], offset + 10, offset + 3, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 9, offset + 4 }, { offset + 6, offset + 4 }, buttonGoodReleasedColor );
fheroes2::SetPixel( released[223 - 32], offset + 10, offset + 5, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 11, offset + 6 }, { offset + 11, offset + 8 }, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 10, offset + 9 }, { offset + 5, offset + 9 }, buttonGoodReleasedColor );
fheroes2::DrawLine( released[223 - 32], { offset + 5, offset + 9 }, { offset + 5, offset + 8 }, buttonGoodReleasedColor );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the last line ends on 5,9 we can make this line into a single pixel:

Suggested change
fheroes2::DrawLine( released[223 - 32], { offset + 5, offset + 9 }, { offset + 5, offset + 8 }, buttonGoodReleasedColor );
fheroes2::SetPixel( released[223 - 32], offset + 5, offset + 8, buttonGoodReleasedColor );

}

void generateGoodCP1254ButtonFont( std::vector<fheroes2::Sprite> & released )
{
// Increase size to fit full CP1254 set of characters. Fill with 1px transparent images.
Expand Down
8 changes: 8 additions & 0 deletions src/fheroes2/gui/ui_keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ namespace
case fheroes2::SupportedLanguage::English:
// English is a default language so it is not considered as an extra language.
return false;
case fheroes2::SupportedLanguage::German:
case fheroes2::SupportedLanguage::Belarusian:
case fheroes2::SupportedLanguage::Czech:
case fheroes2::SupportedLanguage::French:
Expand Down Expand Up @@ -323,6 +324,7 @@ namespace
case fheroes2::SupportedLanguage::Czech:
case fheroes2::SupportedLanguage::English:
case fheroes2::SupportedLanguage::French:
case fheroes2::SupportedLanguage::German:
case fheroes2::SupportedLanguage::Polish:
case fheroes2::SupportedLanguage::Russian:
case fheroes2::SupportedLanguage::Slovak:
Expand Down Expand Up @@ -353,6 +355,8 @@ namespace
return { "QWERTYUIOP", "ASDFGHJKL", "ZXCVBNM" };
case fheroes2::SupportedLanguage::French:
return { "\xC9\xC8\xC7\xC0\xC2\xCA\xCB\xCD\xCE\xCF\xDB\xDC", "AZERTYUIOP\xD4", "QSDFGHJKLM\xD9", "WXCVBN" };
case fheroes2::SupportedLanguage::German:
return { "QWERTZUIOP\xDC", "ASDFGHJKL\xD6\xC4", "YXCVBNM\xDF" };
case fheroes2::SupportedLanguage::Polish:
return { "\x8C\x8F\xA3\xA5\xAF\xC6\xCA\xD1\xD3", "QWERTYUIOP", "ASDFGHJKL", "ZXCVBNM" };
case fheroes2::SupportedLanguage::Russian:
Expand Down Expand Up @@ -381,6 +385,8 @@ namespace
return { "qwertyuiop", "asdfghjkl", "zxcvbnm" };
case fheroes2::SupportedLanguage::French:
return { "\xE9\xE8\xE7\xE0\xE2\xEA\xEB\xED\xEE\xEF\xFB\xFC", "azertyuiop\xF4", "qsdfghjklm\xF9", "wxcvbn" };
case fheroes2::SupportedLanguage::German:
return { "qwertzuiop\xFC", "asdfghjkl\xF6\xE4", "yxcvbnm\xDF" };
case fheroes2::SupportedLanguage::Polish:
return { "\x9C\x9F\xB3\xB9\xBF\xE6\xEA\xF1\xF3", "qwertyuiop", "asdfghjkl", "zxcvbnm" };
case fheroes2::SupportedLanguage::Russian:
Expand Down Expand Up @@ -436,6 +442,7 @@ namespace
case fheroes2::SupportedLanguage::Polish:
return { 30, defaultButtonHeight };
case fheroes2::SupportedLanguage::Belarusian:
case fheroes2::SupportedLanguage::German:
case fheroes2::SupportedLanguage::Russian:
case fheroes2::SupportedLanguage::French:
case fheroes2::SupportedLanguage::Slovak:
Expand Down Expand Up @@ -607,6 +614,7 @@ namespace
case fheroes2::SupportedLanguage::Czech:
case fheroes2::SupportedLanguage::English:
case fheroes2::SupportedLanguage::French:
case fheroes2::SupportedLanguage::German:
case fheroes2::SupportedLanguage::Polish:
case fheroes2::SupportedLanguage::Russian:
case fheroes2::SupportedLanguage::Slovak:
Expand Down
Loading