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

Remove Drawer2D_MeasureText and use Drawer2D_TextWidth/Height instead

Browse Source
This commit is contained in:
UnknownShadow200 2020-04-29 20:04:36 +10:00
parent f2c107b79e
commit 8ce30ea785
5 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Drawer2D.c
View File

@ -594,15 +594,6 @@ int Drawer2D_FontHeight(const struct FontDesc* font, cc_bool useShadow) {
return height;
}
Size2D Drawer2D_MeasureText(struct DrawTextArgs* args) {
Size2D size;
size.Width = Drawer2D_TextWidth(args);
size.Height = Drawer2D_TextHeight(args);
if (!size.Width) size.Height = 0;
return size;
}
void Drawer2D_DrawClippedText(Bitmap* bmp, struct DrawTextArgs* args, int x, int y, int maxWidth) {
char strBuffer[512];
struct DrawTextArgs part;

7
src/Drawer2D.h
View File

@ -59,13 +59,10 @@ void Drawer2D_Underline(Bitmap* bmp, int x, int y, int width, int height, Bitmap
/* Draws text using the given font at the given coordinates. */
CC_API void Drawer2D_DrawText(Bitmap* bmp, struct DrawTextArgs* args, int x, int y);
/* Returns how wide the given text would be when drawn. */
int Drawer2D_TextWidth(struct DrawTextArgs* args);
CC_API int Drawer2D_TextWidth(struct DrawTextArgs* args);
/* Returns how tall the given text would be when drawn. */
/* NOTE: Height returned only depends on the font. (see Drawer2D_FontHeight). */
int Drawer2D_TextHeight(struct DrawTextArgs* args);
/* Returns size the given text would be when drawn. */
/* NOTE: Height returned only depends on the font. (see Drawer2D_FontHeight). */
CC_API Size2D Drawer2D_MeasureText(struct DrawTextArgs* args);
CC_API int Drawer2D_TextHeight(struct DrawTextArgs* args);
/* Similar to Drawer2D_DrawText, but trims the text with trailing ".." if wider than maxWidth. */
void Drawer2D_DrawClippedText(Bitmap* bmp, struct DrawTextArgs* args, int x, int y, int maxWidth);
/* Returns the line height for drawing any character in the font. */

28
src/LWidgets.c
View File

@ -119,8 +119,8 @@ static void LButton_Draw(void* widget) {
int xOffset, yOffset;
if (w->hidden) return;
xOffset = w->width - w->_textSize.Width;
yOffset = w->height - w->_textSize.Height;
xOffset = w->width - w->_textWidth;
yOffset = w->height - w->_textHeight;
DrawTextArgs_Make(&args, &w->text, &Launcher_TitleFont, true);
LButton_DrawBackground(w);
@ -160,7 +160,8 @@ void LButton_SetConst(struct LButton* w, const char* text) {
struct DrawTextArgs args;
w->text = String_FromReadonly(text);
DrawTextArgs_Make(&args, &w->text, &Launcher_TitleFont, true);
w->_textSize = Drawer2D_MeasureText(&args);
w->_textWidth = Drawer2D_TextWidth(&args);
w->_textHeight = Drawer2D_TextHeight(&args);
}
@ -255,15 +256,15 @@ static void LInput_Draw(void* widget) {
struct LInput* w = (struct LInput*)widget;
String text; char textBuffer[STRING_SIZE];
struct DrawTextArgs args;
Size2D size;
int textWidth;
String_InitArray(text, textBuffer);
LInput_GetText(w, &text);
DrawTextArgs_Make(&args, &text, &Launcher_TextFont, false);
size = Drawer2D_MeasureText(&args);
w->width = max(w->minWidth, size.Width + 20);
w->_textHeight = size.Height;
textWidth = Drawer2D_TextWidth(&args);
w->width = max(w->minWidth, textWidth + 20);
w->_textHeight = Drawer2D_TextHeight(&args);
LInput_DrawOuterBorder(w);
LInput_DrawInnerBorder(w);
@ -459,16 +460,16 @@ void LInput_Init(struct LScreen* s, struct LInput* w, int width, const char* hin
void LInput_SetText(struct LInput* w, const String* text_) {
String text; char textBuffer[STRING_SIZE];
struct DrawTextArgs args;
Size2D size;
int textWidth;
String_Copy(&w->text, text_);
String_InitArray(text, textBuffer);
LInput_GetText(w, &text);
DrawTextArgs_Make(&args, &text, &Launcher_TextFont, true);
size = Drawer2D_MeasureText(&args);
w->width = max(w->minWidth, size.Width + 20);
w->_textHeight = size.Height;
textWidth = Drawer2D_TextWidth(&args);
w->width = max(w->minWidth, textWidth + 20);
w->_textHeight = Drawer2D_TextHeight(&args);
}
static CC_NOINLINE cc_bool LInput_AppendRaw(struct LInput* w, char c) {
@ -565,12 +566,11 @@ void LLabel_Init(struct LScreen* s, struct LLabel* w, const char* text) {
void LLabel_SetText(struct LLabel* w, const String* text) {
struct DrawTextArgs args;
Size2D size;
String_Copy(&w->text, text);
DrawTextArgs_Make(&args, &w->text, w->font, true);
size = Drawer2D_MeasureText(&args);
w->width = size.Width; w->height = size.Height;
w->width = Drawer2D_TextWidth(&args);
w->height = Drawer2D_TextHeight(&args);
LWidget_CalcPosition(w);
}

2
src/LWidgets.h
View File

@ -54,7 +54,7 @@ void LWidget_Redraw(void* widget);
struct LButton {
LWidget_Layout
String text;
Size2D _textSize;
int _textWidth, _textHeight;
};
CC_NOINLINE void LButton_Init(struct LScreen* s, struct LButton* w, int width, int height, const char* text);
CC_NOINLINE void LButton_SetConst(struct LButton* w, const char* text);

8
src/Widgets.c
View File

@ -2651,21 +2651,23 @@ static void SpecialInputWidget_DrawTitles(struct SpecialInputWidget* w, Bitmap*
static Size2D SpecialInputWidget_MeasureContent(struct SpecialInputWidget* w, struct SpecialInputTab* tab) {
struct DrawTextArgs args;
int textWidth, textHeight;
Size2D size;
int i, rows;
int maxWidth = 0;
DrawTextArgs_MakeEmpty(&args, w->font, false);
args.text.length = tab->charsPerItem;
textHeight = Drawer2D_TextHeight(&args);
for (i = 0; i < tab->contents.length; i += tab->charsPerItem) {
args.text.buffer = &tab->contents.buffer[i];
size = Drawer2D_MeasureText(&args);
maxWidth = max(maxWidth, size.Width);
textWidth = Drawer2D_TextWidth(&args);
maxWidth = max(maxWidth, textWidth);
}
w->elementWidth = maxWidth + SPECIAL_CONTENT_SPACING;
w->elementHeight = size.Height + SPECIAL_CONTENT_SPACING;
w->elementHeight = textHeight + SPECIAL_CONTENT_SPACING;
rows = Math_CeilDiv(tab->contents.length / tab->charsPerItem, tab->itemsPerRow);
size.Width = w->elementWidth * tab->itemsPerRow;