From e2a11df5e1e660c1df5bca78d78e2fbcf2880c13 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 21 Nov 2021 17:27:58 +0100 Subject: Added small icon size constant. --- src/ui/ui.cc | 2 ++ src/ui/ui.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ui/ui.cc b/src/ui/ui.cc index 6a2987e..95b18e2 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -34,6 +34,8 @@ math::Vector2f UI::elementsize(256, 32); float UI::padding = 24.0f; float UI::margin = 16.0f; +float UI::icon_small = 24.0f; + float UI::pointer_size = 48.0f; core::Cvar *ui_tooltiptimeout = nullptr; diff --git a/src/ui/ui.h b/src/ui/ui.h index c3b2f18..009bed6 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -65,7 +65,7 @@ public: /// load settings from ui.ini void load_settings(); - /* -- fonts ------------------------------------------------ */ + /* -- font & icon sizes------------------------------------- */ /// default tiny font inline const Font *font_tiny() const { @@ -77,17 +77,18 @@ public: return ui_font_small; } - /// default medium font + /// default large font inline const Font *font_large() const { return ui_font_large; } - + + /* -- mouse pointer ---------------------------------------- */ + + /// current position of the mouse cursor in global window coordinates inline const math::Vector2f & global_mouse_coords() { return mouse_cursor; } - - /* -- mouse pointer ---------------------------------------- */ /// set mouse pointer bitmap void set_pointer(const char *pointerbitmap = 0, const Palette::Color color = Palette::Highlight, const bool animated = false); @@ -110,7 +111,8 @@ public: static float pointer_size; - + static float icon_small; + protected: /* -- event handlers --------------------------------------- */ -- cgit v1.2.3