UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[bootloader] Fixed compilation

Browse Source
This commit is contained in:
Laury
2022-05-03 16:34:07 +02:00
parent 0e0dc4a9c2
commit f348d9eb5d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bootloader/interface/src/menu.cpp
View File

@@ -4,8 +4,6 @@
#include <kandinsky/context.h> #include <kandinsky/context.h>
#include <string.h> #include <string.h>
#include <bootloader/computer.h>
const Ion::Keyboard::Key Bootloader::Menu::k_breaking_keys[]; const Ion::Keyboard::Key Bootloader::Menu::k_breaking_keys[];
void Bootloader::Menu::setup() { void Bootloader::Menu::setup() {
@@ -36,15 +34,15 @@ int Bootloader::Menu::calculateCenterX(const char * text, int fontWidth) {
void Bootloader::Menu::showMenu() { void Bootloader::Menu::showMenu() {
KDContext * ctx = KDIonContext::sharedContext(); KDContext * ctx = KDIonContext::sharedContext();
ctx->fillRect(getScreen(), m_background); ctx->fillRect(getScreen(), m_background);
Interface::drawImage(ctx, ImageStore::Computer, 25); Interface::drawComputer(ctx, 25);
int y = ImageStore::Computer->height() + 25 + 10; int y = Interface::computerHeight() + 25 + 10;
int x = calculateCenterX(m_title, largeFontWidth()); int x = calculateCenterX(m_title, largeFontWidth());
ctx->drawString(m_title, KDPoint(x, y), k_large_font, m_foreground, m_background); ctx->drawString(m_title, KDPoint(x, y), k_large_font, m_foreground, m_background);
y += largeFontHeight() + 10; y += largeFontHeight() + 10;
//TODO: center the columns if m_centerY is true //TODO: center the columns if m_centerY is true
for (ColumnBinder column : m_columns) { for (ColumnBinder column : m_columns) {
if (column.isNull()) { if (column.isNull()) {
continue; continue;
} }

12
bootloader/interface/static/interface.cpp
View File

@@ -8,7 +8,9 @@
namespace Bootloader { namespace Bootloader {
void Interface::drawImage(KDContext * ctx, const Image * image, int offset) { void Interface::drawComputer(KDContext * ctx, int offset) {
const Image * image = ImageStore::Computer;
const uint8_t * data; const uint8_t * data;
size_t size; size_t size;
size_t pixelBufferSize; size_t pixelBufferSize;
@@ -37,11 +39,15 @@ void Interface::drawImage(KDContext * ctx, const Image * image, int offset) {
ctx->fillRectWithPixels(bounds, pixelBuffer, nullptr); ctx->fillRectWithPixels(bounds, pixelBuffer, nullptr);
} }
KDCoordinate Interface::computerHeight() {
return ImageStore::Computer->height();
}
void Interface::drawFlasher() { void Interface::drawFlasher() {
KDContext * ctx = KDIonContext::sharedContext(); KDContext * ctx = KDIonContext::sharedContext();
ctx->fillRect(KDRect(0, 0, 320, 240), KDColorWhite); ctx->fillRect(KDRect(0, 0, 320, 240), KDColorWhite);
drawImage(ctx, ImageStore::Computer, 25); drawComputer(ctx, 25);
KDSize fontSize = KDFont::LargeFont->glyphSize(); KDSize fontSize = KDFont::LargeFont->glyphSize();
int initPos = (320 - fontSize.width() * strlen(Messages::mainTitle)) / 2; int initPos = (320 - fontSize.width() * strlen(Messages::mainTitle)) / 2;
@@ -55,7 +61,7 @@ void Interface::drawFlasher() {
void Interface::drawLoading() { void Interface::drawLoading() {
KDContext * ctx = KDIonContext::sharedContext(); KDContext * ctx = KDIonContext::sharedContext();
ctx->fillRect(KDRect(0, 0, 320, 240), KDColorWhite); ctx->fillRect(KDRect(0, 0, 320, 240), KDColorWhite);
drawImage(ctx, ImageStore::Computer, 25); drawComputer(ctx, 25);
Ion::Timing::msleep(250); Ion::Timing::msleep(250);
KDSize fontSize = KDFont::LargeFont->glyphSize(); KDSize fontSize = KDFont::LargeFont->glyphSize();
int initPos = (320 - fontSize.width() * strlen(Messages::mainTitle)) / 2; int initPos = (320 - fontSize.width() * strlen(Messages::mainTitle)) / 2;

3
bootloader/interface/static/interface.h
View File

@@ -9,7 +9,8 @@ namespace Bootloader {
class Interface { class Interface {
public: public:
static void drawImage(KDContext * ctx, const Image * image, int offset); static void drawComputer(KDContext * ctx, int offset);
static KDCoordinate computerHeight();
static void drawLoading(); static void drawLoading();
static void drawFlasher(); static void drawFlasher();
}; };