diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
| commit | 5dbc85eaaa1bd0a0fc11dd76a75ece2efe763df5 (patch) | |
| tree | 9721fb7aced603adb10b9bb3f3beb3f8d5fba973 /src/ui/root.h | |
| parent | 95c527db1484f7758a180c6de051d0182c3b2e81 (diff) | |
| parent | f99a9111170f2ff28383fd3172fdaf4b9a1ba069 (diff) | |
Merge branch 'work/v1.6' into work/serious-unicode
# Conflicts:
# res/fonts/SmolEmoji-Regular.ttf
Diffstat (limited to 'src/ui/root.h')
| -rw-r--r-- | src/ui/root.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/root.h b/src/ui/root.h index 96864a15..740e97c9 100644 --- a/src/ui/root.h +++ b/src/ui/root.h | |||
| @@ -34,7 +34,8 @@ void postArrange_Root (iRoot *); | |||
| 34 | void updateMetrics_Root (iRoot *); | 34 | void updateMetrics_Root (iRoot *); |
| 35 | void updatePadding_Root (iRoot *); /* TODO: is part of metrics? */ | 35 | void updatePadding_Root (iRoot *); /* TODO: is part of metrics? */ |
| 36 | void dismissPortraitPhoneSidebars_Root (iRoot *); | 36 | void dismissPortraitPhoneSidebars_Root (iRoot *); |
| 37 | void showToolbars_Root (iRoot *, iBool show); | 37 | void showToolbar_Root (iRoot *, iBool show); |
| 38 | void updateToolbarColors_Root (iRoot *); | ||
| 38 | 39 | ||
| 39 | iInt2 size_Root (const iRoot *); | 40 | iInt2 size_Root (const iRoot *); |
| 40 | iRect rect_Root (const iRoot *); | 41 | iRect rect_Root (const iRoot *); |