Skip to content

Commit d35ba2f

Browse files
committed
Fix navigator, update conversions
1 parent 705ab9a commit d35ba2f

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

applications/fenster

Submodule fenster updated 47 files

applications/libinput/src/keyboard.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ g_key_info g_keyboard::readKey(g_fd in)
5656
return g_key_info();
5757
}
5858

59-
bool g_keyboard::keyForScancode(uint8_t scancode, g_key_info *out)
59+
bool g_keyboard::keyForScancode(uint8_t scancode, g_key_info* out)
6060
{
6161

6262
// Get "pressed" info from scancode
@@ -183,7 +183,7 @@ bool g_keyboard::loadScancodeLayout(std::string iso)
183183
scancodeLayout.clear();
184184
std::map<std::string, std::string> properties = props.getProperties();
185185

186-
for(auto entry : properties)
186+
for(auto entry: properties)
187187
{
188188

189189
uint32_t scancode = 0;
@@ -251,7 +251,7 @@ bool g_keyboard::loadConversionLayout(std::string iso)
251251
conversionLayout.clear();
252252

253253
std::map<std::string, std::string> properties = props.getProperties();
254-
for(auto entry : properties)
254+
for(auto entry: properties)
255255
{
256256

257257
// create key info value
@@ -305,8 +305,15 @@ bool g_keyboard::loadConversionLayout(std::string iso)
305305
{
306306
c = value[0];
307307

308-
// Escaped numeric values
309-
if(c == '\\')
308+
if(value == "\\n")
309+
{
310+
c = '\n';
311+
}
312+
else if(value == "\\t")
313+
{
314+
c = '\t';
315+
}
316+
else if(c == '\\') // Escaped numeric values
310317
{
311318
if(value.length() > 1)
312319
{

applications/navigator/src/navigator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ int main()
7777

7878
Panel* navBar = Panel::create();
7979
auto navBarLayout = FlexLayout::create(navBar);
80+
navBarLayout->setOrientation(Orientation::Horizontal);
8081
navBarLayout->setPadding(Insets(5, 5, 5, 5));
8182
navBarLayout->setSpace(10);
8283
{

sysroot/system/keyboard/de-DE.conversion

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ KEY_Z s : Z
5555
KEY_SPACE: " "
5656
KEY_SPACE s: " "
5757

58+
KEY_ENTER: \n
59+
KEY_TAB : \t
60+
5861
KEY_1 : 1
5962
KEY_1 s : !
6063
KEY_2 : 2

0 commit comments

Comments
 (0)