forked from ihhub/fheroes2
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new UI Text rendering classes (ihhub#3653)
New code is faster as it doesn't copy strings for multi-line rendering, it's scalable for font types and it supports multi-font rendering. However, we'll need an extensive testing to fully use this code.
- Loading branch information
Showing
10 changed files
with
864 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /*************************************************************************** | ||
| * Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2021 * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| * This program is distributed in the hope that it will be useful, * | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
| * GNU General Public License for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU General Public License * | ||
| * along with this program; if not, write to the * | ||
| * Free Software Foundation, Inc., * | ||
| * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "ui_dialog.h" | ||
| #include "cursor.h" | ||
| #include "dialog.h" | ||
| #include "localevent.h" | ||
| #include "screen.h" | ||
| #include "ui_button.h" | ||
|
|
||
| namespace | ||
| { | ||
| const int32_t textOffsetY = 10; | ||
| } | ||
|
|
||
| namespace fheroes2 | ||
| { | ||
| int showMessage( const TextBase & header, const TextBase & body, const int buttons ) | ||
| { | ||
| // setup cursor | ||
| const CursorRestorer cursorRestorer( buttons != 0, ::Cursor::POINTER ); | ||
|
|
||
| const int32_t headerHeight = header.empty() ? 0 : header.height( BOXAREA_WIDTH ) + textOffsetY; | ||
|
|
||
| Dialog::FrameBox box( textOffsetY + headerHeight + body.height( BOXAREA_WIDTH ), buttons != 0 ); | ||
| const Rect & pos = box.GetArea(); | ||
|
|
||
| Display & display = Display::instance(); | ||
| header.draw( pos.x, pos.y + textOffsetY, BOXAREA_WIDTH, display ); | ||
| body.draw( pos.x, pos.y + textOffsetY + headerHeight, BOXAREA_WIDTH, display ); | ||
|
|
||
| ButtonGroup group( pos, buttons ); | ||
| group.draw(); | ||
|
|
||
| display.render(); | ||
|
|
||
| int result = Dialog::ZERO; | ||
| LocalEvent & le = LocalEvent::Get(); | ||
|
|
||
| while ( result == Dialog::ZERO && le.HandleEvents() ) { | ||
| if ( !buttons && !le.MousePressRight() ) { | ||
| break; | ||
| } | ||
|
|
||
| result = group.processEvents(); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /*************************************************************************** | ||
| * Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2021 * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| * This program is distributed in the hope that it will be useful, * | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
| * GNU General Public License for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU General Public License * | ||
| * along with this program; if not, write to the * | ||
| * Free Software Foundation, Inc., * | ||
| * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | ||
| ***************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
|
|
||
| #include "ui_text.h" | ||
|
|
||
| namespace fheroes2 | ||
| { | ||
| int showMessage( const TextBase & header, const TextBase & body, const int buttons ); | ||
| } |
Oops, something went wrong.