Исправлено

- Фикс расширяемости фрейма в настройках

Выделен патч для фикса смены языка/расположения иконки для x32
This commit is contained in:
Alexander Zhirov 2023-02-20 19:09:40 +03:00
parent a1d7766e47
commit 217ed1d0a5
2 changed files with 24 additions and 1 deletions

View File

@ -398,9 +398,10 @@ static Ihandle* settingsBoxAbout()
IupSetAttribute(inputAbout, "VISIBLELINES", "6"); IupSetAttribute(inputAbout, "VISIBLELINES", "6");
IupSetAttribute(inputAbout, "PADDING", "5"); IupSetAttribute(inputAbout, "PADDING", "5");
IupSetAttribute(inputAbout, "FORMATTING", "YES"); IupSetAttribute(inputAbout, "FORMATTING", "YES");
IupSetAttribute(inputAbout, "EXPAND", "YES");
IupSetAttribute(inputAbout, "VALUE", getAbout()); IupSetAttribute(inputAbout, "VALUE", getAbout());
return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=10x10"); return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=5x5");
} }
static Ihandle* settingsHorizontalBox() static Ihandle* settingsHorizontalBox()

22
i586.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/freerdp/client/X11/cli/gui.c b/freerdp/client/X11/cli/gui.c
index 7cbd9aa..181a3cc 100644
--- a/freerdp/client/X11/cli/gui.c
+++ b/freerdp/client/X11/cli/gui.c
@@ -214,7 +214,7 @@ Ihandle* guiStart()
IupSetAttribute(iconLang, "NAME", "KEYBOARD");
IupSetAttribute(iconLang, "IMAGE", "keyboardRu");
IupSetAttribute(iconLang, "FLOATING", "YES");
- IupSetAttribute(iconLang, "POSITION", "13,222");
+ IupSetAttribute(iconLang, "POSITION", "13,235");
IupSetAttribute(iconLang, "TIP", "Текущая раскладка клавиатуры (Alt+Shift)");
#endif
@@ -268,7 +268,7 @@ Ihandle* guiStart()
IupSetAttribute(dlg, "DEFAULTENTER", "CONNECT");
IupSetAttribute(dlg, "DEFAULTESC", "CLOSE");
#ifdef IUP_WITH_LANGUAGE_KEYBOARD_ICON
- IupSetCallback(dlg, "iup_XkeyAlt(K_LSHIFT)", (Icallback) k_any);
+ IupSetCallback(dlg, "K_ANY", (Icallback) k_any);
IupSetCallback(dlg, "GETFOCUS_CB", (Icallback) k_any);
#endif