RPJosh
/
Pocketbook-Nextcloud-Client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix opening and closing of fonts in menuhandler

pull/23/head
JuanJakobo 2021-01-12 16:24:49 +01:00
parent 1f5f2afe6e
commit d301534495
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/handler/menuHandler.cpp
View File

@ -10,7 +10,6 @@
#include "menuHandler.h" #include "menuHandler.h"
#include <string> #include <string>
#include <memory>
using std::string; using std::string;
@ -23,9 +22,10 @@ MenuHandler::MenuHandler(const string &name)
_panelMenuBeginX = ScreenWidth() - _mainMenuWidth; _panelMenuBeginX = ScreenWidth() - _mainMenuWidth;
_menuButtonRect = iRect(_mainMenuWidth * 2, _panelMenuBeginY, _mainMenuWidth, _panelMenuHeight, ALIGN_RIGHT); _menuButtonRect = iRect(_mainMenuWidth * 2, _panelMenuBeginY, _mainMenuWidth, _panelMenuHeight, ALIGN_RIGHT);
_menuFont = std::unique_ptr<ifont>(OpenFont("LiberationMono-Bold", _panelMenuHeight / 2, 1));
SetFont(_menuFont.get(), BLACK); _menuFont = OpenFont("LiberationMono-Bold", _panelMenuHeight / 2, 1);
SetFont(_menuFont, BLACK);
DrawTextRect(0, _panelMenuBeginY, ScreenWidth(), _panelMenuHeight, name.c_str(), ALIGN_CENTER); DrawTextRect(0, _panelMenuBeginY, ScreenWidth(), _panelMenuHeight, name.c_str(), ALIGN_CENTER);
DrawTextRect2(&_menuButtonRect, "Menu"); DrawTextRect2(&_menuButtonRect, "Menu");
DrawLine(0, _panelMenuHeight - 1, ScreenWidth(), _panelMenuHeight - 1, BLACK); DrawLine(0, _panelMenuHeight - 1, ScreenWidth(), _panelMenuHeight - 1, BLACK);
@ -33,12 +33,18 @@ MenuHandler::MenuHandler(const string &name)
_contentRect = iRect(0, _panelMenuHeight, ScreenWidth(), (ScreenHeight() - PanelHeight() - _panelMenuHeight), 0); _contentRect = iRect(0, _panelMenuHeight, ScreenWidth(), (ScreenHeight() - PanelHeight() - _panelMenuHeight), 0);
_loadingScreenRect = iRect(_contentRect.w / 2 - 125, _contentRect.h / 2 - 50, 250, 100, ALIGN_CENTER); _loadingScreenRect = iRect(_contentRect.w / 2 - 125, _contentRect.h / 2 - 50, 250, 100, ALIGN_CENTER);
_loadingFont = std::unique_ptr<ifont>(OpenFont("LiberationMono", _loadingScreenRect.h / 4, 1)); _loadingFont = OpenFont("LiberationMono", _loadingScreenRect.h / 4, 1);
SetHardTimer("PANELUPDATE", panelHandlerStatic, 110000); SetHardTimer("PANELUPDATE", panelHandlerStatic, 110000);
DrawPanel(NULL, "", NULL, -1); DrawPanel(NULL, "", NULL, -1);
} }
MenuHandler::~MenuHandler()
{
CloseFont(_menuFont);
CloseFont(_loadingFont);
}
void MenuHandler::panelHandlerStatic() void MenuHandler::panelHandlerStatic()
{ {
DrawPanel(NULL, "", NULL, -1); DrawPanel(NULL, "", NULL, -1);
@ -79,7 +85,7 @@ int MenuHandler::createMenu(bool loggedIn, bool workOffline, iv_menuhandler hand
void MenuHandler::drawLoadingScreen() void MenuHandler::drawLoadingScreen()
{ {
SetFont(_loadingFont.get(), BLACK); SetFont(_loadingFont, BLACK);
DrawTextRect2(&_loadingScreenRect, "Loading..."); DrawTextRect2(&_loadingScreenRect, "Loading...");
PartialUpdate(_loadingScreenRect.x, _loadingScreenRect.y, _loadingScreenRect.w, _loadingScreenRect.h); PartialUpdate(_loadingScreenRect.x, _loadingScreenRect.y, _loadingScreenRect.w, _loadingScreenRect.h);
} }

7
src/handler/menuHandler.h
View File

@ -10,7 +10,6 @@
#define MENU_HANDLER #define MENU_HANDLER
#include <string> #include <string>
#include <memory>
using std::string; using std::string;
@ -24,6 +23,8 @@ public:
*/ */
MenuHandler(const string &name); MenuHandler(const string &name);
~MenuHandler();
irect *getContentRect() { return &_contentRect; }; irect *getContentRect() { return &_contentRect; };
irect *getMenuButtonRect() { return &_menuButtonRect; }; irect *getMenuButtonRect() { return &_menuButtonRect; };
@ -39,8 +40,8 @@ public:
void drawLoadingScreen(); void drawLoadingScreen();
private: private:
std::unique_ptr<ifont> _menuFont; ifont *_menuFont;
std::unique_ptr<ifont> _loadingFont; ifont *_loadingFont;
int _panelMenuBeginX; int _panelMenuBeginX;
int _panelMenuBeginY; int _panelMenuBeginY;