Skip to content

Commit

Permalink
change color/font order in CreateFancyTextual to match order in rest …
Browse files Browse the repository at this point in the history
…of api
  • Loading branch information
ericoporto committed Apr 18, 2024
1 parent ff4ab80 commit 8d97b68
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fancy_demo/fancy.asc
Original file line number Diff line number Diff line change
Expand Up @@ -635,15 +635,15 @@ DynamicSprite* CreateFromFancyTextBox(static DynamicSprite, int color, FontType
return box_spr;
}

Overlay* CreateFancyTextual(static Overlay, int x, int y, int width, FontType font, int color, const string text)
Overlay* CreateFancyTextual(static Overlay, int x, int y, int width, int color, FontType font, const string text)
{
DynamicSprite* spr = DynamicSprite.CreateFromFancyStringWrapped(width, color, font, text);
Overlay* ovr = Overlay.CreateGraphical(x, y, spr.Graphic, true, true);
spr.Delete();
return ovr;
}

Overlay* CreateFancyTextBox(static Overlay, int x, int y, int width, FontType font, int color, const string text, Fancy9Piece* f9p)
Overlay* CreateFancyTextBox(static Overlay, int x, int y, int width, int color, FontType font, const string text, Fancy9Piece* f9p)
{
DynamicSprite* spr = DynamicSprite.CreateFromFancyTextBox(color, font, f9p, text, width);
Overlay* ovr = Overlay.CreateGraphical(x, y, spr.Graphic, true, true);
Expand Down
4 changes: 2 additions & 2 deletions fancy_demo/fancy.ash
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ import DynamicSprite* CreateFromFancyString(static DynamicSprite, int color, Fon
import DynamicSprite* CreateFromFancyTextBox(static DynamicSprite, int color, FontType font, Fancy9Piece* f9p, const string text, int width = FANCY_INFINITE_WIDTH);

/// Creates a screen overlay from fancy text
import Overlay* CreateFancyTextual(static Overlay, int x, int y, int width, FontType font, int color, const string text);
import Overlay* CreateFancyTextual(static Overlay, int x, int y, int width, int color, FontType font, const string text);

/// Creates a screen overlay from a textbox with a fancy string using a 9-piece
import Overlay* CreateFancyTextBox(static Overlay, int x, int y, int width, FontType font, int color, const string text, Fancy9Piece* f9p);
import Overlay* CreateFancyTextBox(static Overlay, int x, int y, int width, int color, FontType font, const string text, Fancy9Piece* f9p);

/// Sets a button NormalGraphic and additional sprites from it's text, assumed as fancy string, and 9-piece.
import void Fancify(this Button*, Fancy9Piece* normal, Fancy9Piece* mouse_over = 0, Fancy9Piece* pushed = 0);
Expand Down

0 comments on commit 8d97b68

Please sign in to comment.