github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Added global t_, tt_ (to fix layout issue)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15819 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2021-03-07 09:11:00 +00:00
parent c6e4476a3e
commit 2d2ec310a7
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/Core/Core.h
View file

@ -437,4 +437,7 @@ void FreeDll__(DLLHANDLE dllhandle);
using Upp::byte; // Dirty solution to Windows.h typedef byte...
#endif
inline const char *t_(const char *s) { return Upp::t_GetLngString(s); }
inline const char *tt_(const char *s) { return s; }
#endif //CORE_H

6
uppsrc/CtrlCore/lay.h
View file

@ -14,7 +14,7 @@
#define LAYOUT(name, x, y) template<class T> \
struct With##name : public T, public name##__layid { \
static UPP::Size GetLayoutSize() { return UPP::Ctrl::LayoutZoom(x, y); }
static Upp::Size GetLayoutSize() { return Upp::Ctrl::LayoutZoom(x, y); }
#define UNTYPED(variable, param)
#define ITEM(classname, var, param) classname var;
#define END_LAYOUT };
@ -27,7 +27,7 @@
#undef END_LAYOUT
#define LAYOUT(nm, x, y) template<class T> inline void SetLayout_##nm(T& parent, bool add = false, bool show = false) { \
SetLayout_Size(parent, Zx(x), Zy(y));
SetLayout_Size(parent, Upp::Zx(x), Upp::Zy(y));
#define UNTYPED(var, param) parent.var.param; if(add) parent.Add(parent.var); if(show) parent.var.Show();
#define ITEM(clss, var, param) UNTYPED(var, param);
#define END_LAYOUT }
@ -40,7 +40,7 @@
#undef END_LAYOUT
#define LAYOUT(nm, x, y) template<class T, class D> inline void SetLayout_##nm(T& ctrl, D& parent, bool add = false, bool show = false) { \
SetLayout_Size(ctrl, Zx(x), Zy(y));
SetLayout_Size(ctrl, Upp::Zx(x), Upp::Zy(y));
#define UNTYPED(var, param) parent.var.param; if(add) ctrl.Add(parent.var); if(show) parent.var.Show();
#define ITEM(clss, var, param) UNTYPED(var, param);
#define END_LAYOUT }

2
uppsrc/ide/UppHub.cpp
View file

@ -164,7 +164,7 @@ void UppHubDlg::Menu(Bar& bar)
}
Install(names);
});
bar.Add("Reinstall everything..", [=] {
bar.Add("Reinstall all..", [=] {
Index<String> names;
for(const UppHubNest& n : upv)
if(DirectoryExists(hubdir + "/" + n.name))