Browse Source

Merge branch 'master' of https://github.com/raysan5/raylib

pull/3255/head
Ray 1 year ago
parent
commit
f95dc2d565
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      examples/text/text_unicode.c

+ 6
- 7
examples/text/text_unicode.c View File

@ -187,12 +187,11 @@ int main(void)
// Add a new set of emojis when SPACE is pressed // Add a new set of emojis when SPACE is pressed
if (IsKeyPressed(KEY_SPACE)) RandomizeEmoji(); if (IsKeyPressed(KEY_SPACE)) RandomizeEmoji();
// Set the selected emoji and copy its text to clipboard
// Set the selected emoji
if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && (hovered != -1) && (hovered != selected)) if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && (hovered != -1) && (hovered != selected))
{ {
selected = hovered; selected = hovered;
selectedPos = hoveredPos; selectedPos = hoveredPos;
SetClipboardText(messages[emoji[selected].message].text);
} }
Vector2 mouse = GetMousePosition(); Vector2 mouse = GetMousePosition();
@ -267,7 +266,7 @@ int main(void)
a = b; a = b;
b = tmp; b = tmp;
} }
if (msgRect.x + msgRect.width > screenWidth) msgRect.x -= (msgRect.x + msgRect.width) - screenWidth + 10; if (msgRect.x + msgRect.width > screenWidth) msgRect.x -= (msgRect.x + msgRect.width) - screenWidth + 10;
// Draw chat bubble // Draw chat bubble
@ -287,11 +286,11 @@ int main(void)
DrawText(info, (int)pos.x, (int)pos.y, 10, RAYWHITE); DrawText(info, (int)pos.x, (int)pos.y, 10, RAYWHITE);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Draw the info text // Draw the info text
DrawText("These emojis have something to tell you, click each to find out!", (screenWidth - 650)/2, screenHeight - 40, 20, GRAY); DrawText("These emojis have something to tell you, click each to find out!", (screenWidth - 650)/2, screenHeight - 40, 20, GRAY);
DrawText("Each emoji is a unicode character from a font, not a texture... Press [SPACEBAR] to refresh", (screenWidth - 484)/2, screenHeight - 16, 10, GRAY); DrawText("Each emoji is a unicode character from a font, not a texture... Press [SPACEBAR] to refresh", (screenWidth - 484)/2, screenHeight - 16, 10, GRAY);
EndDrawing(); EndDrawing();
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
} }
@ -342,7 +341,7 @@ static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec,
{ {
int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop
float textOffsetY = i">0; // Offset between lines (on line break '\n')
float textOffsetY = f">0.0f; // Offset between lines (on line break '\n')
float textOffsetX = 0.0f; // Offset X to next character to draw float textOffsetX = 0.0f; // Offset X to next character to draw
float scaleFactor = fontSize/(float)font.baseSize; // Character rectangle scaling factor float scaleFactor = fontSize/(float)font.baseSize; // Character rectangle scaling factor
@ -465,4 +464,4 @@ static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec,
textOffsetX += glyphWidth; textOffsetX += glyphWidth;
} }
}
}

Loading…
Cancel
Save