AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 09:35:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

iOS: Fix buttons having 4 garbage pixels around them

Browse Source
This commit is contained in:
UnknownShadow200 2022-05-06 19:57:53 +10:00
parent 9d5e821273
commit be322ae46b
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/LWidgets.c
View File

@ -15,12 +15,12 @@
#include "LBackend.h" #include "LBackend.h"
static int flagXOffset, flagYOffset; static int flagXOffset, flagYOffset;
static int xBorder, xBorder2, xBorder4; static int oneX, twoX, fourX;
static int yBorder, yBorder2, yBorder4; static int oneY, twoY, fourY;
void LWidget_CalcOffsets(void) { void LWidget_CalcOffsets(void) {
xBorder = Display_ScaleX(1); xBorder2 = xBorder * 2; xBorder4 = xBorder * 4; oneX = Display_ScaleX(1); twoX = oneX * 2; fourX = oneX * 4;
yBorder = Display_ScaleY(1); yBorder2 = yBorder * 2; yBorder4 = yBorder * 4; oneY = Display_ScaleY(1); twoY = oneY * 2; fourY = oneY * 4;
flagXOffset = Display_ScaleX(2); flagXOffset = Display_ScaleX(2);
flagYOffset = Display_ScaleY(6); flagYOffset = Display_ScaleY(6);
@ -58,30 +58,36 @@ static void LButton_DrawBase(struct LButton* w, struct Bitmap* bmp, int x, int y
if (Launcher_Theme.ClassicBackground) { if (Launcher_Theme.ClassicBackground) {
Gradient_Noise(bmp, color, 8, Gradient_Noise(bmp, color, 8,
x + xBorder, y + yBorder, x + oneX, y + oneY,
w->width - xBorder2, w->height - yBorder2); w->width - twoX, w->height - twoY);
} else { } else {
Gradient_Vertical(bmp, LButton_Expand(color, 8), LButton_Expand(color, -8), Gradient_Vertical(bmp, LButton_Expand(color, 8), LButton_Expand(color, -8),
x + xBorder, y + yBorder, x + oneX, y + oneY,
w->width - xBorder2, w->height - yBorder2); w->width - twoX, w->height - twoY);
} }
} }
static void LButton_DrawBorder(struct LButton* w, struct Bitmap* bmp, int x, int y) { static void LButton_DrawBorder(struct LButton* w, struct Bitmap* bmp, int x, int y) {
BitmapCol backColor = Launcher_Theme.ButtonBorderColor; BitmapCol backColor = Launcher_Theme.ButtonBorderColor;
#ifdef CC_BUILD_IOS
int xoff = 0; /* TODO temp hack */
#else
int xoff = oneX;
#endif
Drawer2D_Clear(bmp, backColor, Drawer2D_Clear(bmp, backColor,
x + xBorder, y, x + xoff, y,
w->width - xBorder2, yBorder); w->width - 2 * xoff, oneY);
Drawer2D_Clear(bmp, backColor, Drawer2D_Clear(bmp, backColor,
x + xBorder, y + w->height - yBorder, x + xoff, y + w->height - oneY,
w->width - xBorder2, yBorder); w->width - 2 * xoff, oneY);
Drawer2D_Clear(bmp, backColor, Drawer2D_Clear(bmp, backColor,
x, y + yBorder, x, y + oneY,
xBorder, w->height - yBorder2); oneX, w->height - twoY);
Drawer2D_Clear(bmp, backColor, Drawer2D_Clear(bmp, backColor,
x + w->width - xBorder, y + yBorder, x + w->width - oneX, y + oneY,
xBorder, w->height - yBorder2); oneX, w->height - twoY);
} }
static void LButton_DrawHighlight(struct LButton* w, struct Bitmap* bmp, int x, int y) { static void LButton_DrawHighlight(struct LButton* w, struct Bitmap* bmp, int x, int y) {
@ -92,15 +98,15 @@ static void LButton_DrawHighlight(struct LButton* w, struct Bitmap* bmp, int x,
if (w->hovered) color = activeColor; if (w->hovered) color = activeColor;
Drawer2D_Clear(bmp, color, Drawer2D_Clear(bmp, color,
x + xBorder2, y + yBorder, x + twoX, y + oneY,
w->width - xBorder4, yBorder); w->width - fourX, oneY);
Drawer2D_Clear(bmp, color, Drawer2D_Clear(bmp, color,
x + xBorder, y + yBorder2, x + oneX, y + twoY,
xBorder, w->height - yBorder4); oneX, w->height - fourY);
} else if (!w->hovered) { } else if (!w->hovered) {
Drawer2D_Clear(bmp, color, Drawer2D_Clear(bmp, color,
x + xBorder2, y + yBorder, x + twoX, y + oneY,
w->width - xBorder4, yBorder); w->width - fourX, oneY);
} }
} }