2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00

merged with master

This commit is contained in:
John Preston
2016-02-21 20:01:37 +03:00
27 changed files with 147 additions and 57 deletions

View File

@@ -138,7 +138,9 @@ namespace Global {
void finish();
DeclareReadOnlyVar(uint64, LaunchId);
DeclareVar(Adaptive::Layout, AdaptiveLayout);
DeclareVar(bool, AdaptiveForWide);
// config
DeclareVar(int32, ChatSizeMax);
@@ -167,6 +169,6 @@ namespace Adaptive {
return Global::AdaptiveLayout() == NormalLayout;
}
inline bool Wide() {
return Global::AdaptiveLayout() == WideLayout;
return Global::AdaptiveForWide() && (Global::AdaptiveLayout() == WideLayout);
}
}