mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
menu: fix item height calculation
The height of the description was never 0. Switching to std::string
makes handling easier. Locales are secondary because only strings
come out at the end.
Origin commit data
------------------
Commit: 76d5c0c1be
Author: Thilo Graf <dbt@novatux.de>
Date: 2022-04-07 (Thu, 07 Apr 2022)
This commit is contained in:
@@ -127,7 +127,6 @@ class CMenuItem : public CComponentsSignals
|
||||
std::string luaId;
|
||||
neutrino_locale_t name;
|
||||
std::string nameString;
|
||||
neutrino_locale_t desc;
|
||||
std::string descString;
|
||||
CActivateObserver * actObserv;
|
||||
|
||||
@@ -198,9 +197,9 @@ class CMenuItem : public CComponentsSignals
|
||||
virtual void setName(const std::string& text);
|
||||
virtual void setName(const neutrino_locale_t text);
|
||||
sigc::signal<void> OnPaintItem;
|
||||
virtual const char *getDescription();
|
||||
virtual std::string getDescription();
|
||||
virtual void setDescription(const std::string& text);
|
||||
virtual void setDescription(const neutrino_locale_t text);
|
||||
virtual void setDescription(const neutrino_locale_t locale_text);
|
||||
virtual int getDescriptionHeight(void);
|
||||
void setActivateObserver(CActivateObserver * Observ) { actObserv = Observ; }
|
||||
void activateNotify(void);
|
||||
|
Reference in New Issue
Block a user