[Horus] Last commit broke the UI :(
This commit is contained in:
@@ -217,7 +217,7 @@ bool menuSetupScreensView(evt_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
unsigned int lastDisplayedLayout = min<int>(menuHorizontalOffset + 4, countRegisteredLayouts);
|
unsigned int lastDisplayedLayout = min<int>(menuHorizontalOffset + 4, countRegisteredLayouts);
|
||||||
for (uint8_t i=menuHorizontalOffset, x=SCREENS_SETUP_2ND_COLUMN; i<lastDisplayedLayout; i++, x += 56) {
|
for (unsigned int i=menuHorizontalOffset, x=SCREENS_SETUP_2ND_COLUMN; i<lastDisplayedLayout; i++, x += 56) {
|
||||||
const LayoutFactory * factory = registeredLayouts[i];
|
const LayoutFactory * factory = registeredLayouts[i];
|
||||||
factory->drawThumb(x, y, currentScreen->getFactory() == factory ? (menuHorizontalPosition < 0 ? TEXT_INVERTED_COLOR : TEXT_INVERTED_BGCOLOR) : LINE_COLOR);
|
factory->drawThumb(x, y, currentScreen->getFactory() == factory ? (menuHorizontalPosition < 0 ? TEXT_INVERTED_COLOR : TEXT_INVERTED_BGCOLOR) : LINE_COLOR);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ void ModelPanelWidget::refresh()
|
|||||||
lcdDrawBitmapPattern(zone.x + 6, zone.y + 4, LBM_MODEL_ICON, TITLE_BGCOLOR);
|
lcdDrawBitmapPattern(zone.x + 6, zone.y + 4, LBM_MODEL_ICON, TITLE_BGCOLOR);
|
||||||
lcdDrawSizedText(zone.x + 45, zone.y + 10, g_model.header.name, LEN_MODEL_NAME, ZCHAR | SMLSIZE);
|
lcdDrawSizedText(zone.x + 45, zone.y + 10, g_model.header.name, LEN_MODEL_NAME, ZCHAR | SMLSIZE);
|
||||||
lcdDrawSolidHorizontalLine(zone.x + 39, zone.y + 27, zone.w - 48, TITLE_BGCOLOR);
|
lcdDrawSolidHorizontalLine(zone.x + 39, zone.y + 27, zone.w - 48, TITLE_BGCOLOR);
|
||||||
int scale = getBitmapScale(modelBitmap, zone.w, zone.h);
|
int scale = getBitmapScale(modelBitmap, zone.w, zone.h - 25);
|
||||||
int width = getBitmapScaledSize(getBitmapWidth(modelBitmap), scale);
|
int width = getBitmapScaledSize(getBitmapWidth(modelBitmap), scale);
|
||||||
int height = getBitmapScaledSize(getBitmapHeight(modelBitmap), scale);
|
int height = getBitmapScaledSize(getBitmapHeight(modelBitmap), scale);
|
||||||
lcdDrawBitmap(zone.x + (zone.w - width) / 2, zone.y + zone.h - height / 2 - height / 2, modelBitmap, 0, 0, scale);
|
lcdDrawBitmap(zone.x + (zone.w - width) / 2, zone.y + zone.h - height / 2 - height / 2, modelBitmap, 0, 0, scale);
|
||||||
|
|||||||
Reference in New Issue
Block a user