mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'gui_view' into 'master'

Browse Source 
Use string_view in journal code

See merge request OpenMW/openmw!3005
pull/3232/head
Alexei Kotov 2 years ago
parent 0a8c801d66 f93d41d9ce
commit 4394970894
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
apps/openmw/mwgui/bookpage.cpp
Unescape Escape View File

@ -49,8 +49,8 @@ namespace MWGui
&& partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId); && partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
} }
bool match(char const* tstFont, const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour, bool match(std::string_view tstFont, const MyGUI::Colour& tstHotColour,
const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId) const MyGUI::Colour& tstActiveColour, const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
{ {
return (mFont->getResourceName() == tstFont) return (mFont->getResourceName() == tstFont)
&& partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId); && partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
@ -280,7 +280,7 @@ namespace MWGui
fullFontName = "Journalbook " + fullFontName; fullFontName = "Journalbook " + fullFontName;
for (Styles::iterator i = mBook->mStyles.begin(); i != mBook->mStyles.end(); ++i) for (Styles::iterator i = mBook->mStyles.begin(); i != mBook->mStyles.end(); ++i)
if (i->match(fullFontName.c_str(), fontColour, fontColour, fontColour, 0)) if (i->match(fullFontName, fontColour, fontColour, fontColour, 0))
return &*i; return &*i;
MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fullFontName); MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fullFontName);

1
apps/openmw/mwgui/journalbooks.hpp
Unescape Escape View File

@ -20,7 +20,6 @@ namespace MWGui
Book createEmptyJournalBook(); Book createEmptyJournalBook();
Book createJournalBook(); Book createJournalBook();
Book createTopicBook(uintptr_t topicId); Book createTopicBook(uintptr_t topicId);
Book createTopicBook(const std::string& topicId);
Book createQuestBook(std::string_view questName); Book createQuestBook(std::string_view questName);
Book createTopicIndexBook(); Book createTopicIndexBook();

52
apps/openmw/mwgui/journalwindow.cpp
Unescape Escape View File

@ -24,26 +24,26 @@
namespace namespace
{ {
static char const OptionsOverlay[] = "OptionsOverlay"; static constexpr std::string_view OptionsOverlay = "OptionsOverlay";
static char const OptionsBTN[] = "OptionsBTN"; static constexpr std::string_view OptionsBTN = "OptionsBTN";
static char const PrevPageBTN[] = "PrevPageBTN"; static constexpr std::string_view PrevPageBTN = "PrevPageBTN";
static char const NextPageBTN[] = "NextPageBTN"; static constexpr std::string_view NextPageBTN = "NextPageBTN";
static char const CloseBTN[] = "CloseBTN"; static constexpr std::string_view CloseBTN = "CloseBTN";
static char const JournalBTN[] = "JournalBTN"; static constexpr std::string_view JournalBTN = "JournalBTN";
static char const TopicsBTN[] = "TopicsBTN"; static constexpr std::string_view TopicsBTN = "TopicsBTN";
static char const QuestsBTN[] = "QuestsBTN"; static constexpr std::string_view QuestsBTN = "QuestsBTN";
static char const CancelBTN[] = "CancelBTN"; static constexpr std::string_view CancelBTN = "CancelBTN";
static char const ShowAllBTN[] = "ShowAllBTN"; static constexpr std::string_view ShowAllBTN = "ShowAllBTN";
static char const ShowActiveBTN[] = "ShowActiveBTN"; static constexpr std::string_view ShowActiveBTN = "ShowActiveBTN";
static char const PageOneNum[] = "PageOneNum"; static constexpr std::string_view PageOneNum = "PageOneNum";
static char const PageTwoNum[] = "PageTwoNum"; static constexpr std::string_view PageTwoNum = "PageTwoNum";
static char const TopicsList[] = "TopicsList"; static constexpr std::string_view TopicsList = "TopicsList";
static char const QuestsList[] = "QuestsList"; static constexpr std::string_view QuestsList = "QuestsList";
static char const LeftBookPage[] = "LeftBookPage"; static constexpr std::string_view LeftBookPage = "LeftBookPage";
static char const RightBookPage[] = "RightBookPage"; static constexpr std::string_view RightBookPage = "RightBookPage";
static char const LeftTopicIndex[] = "LeftTopicIndex"; static constexpr std::string_view LeftTopicIndex = "LeftTopicIndex";
static char const CenterTopicIndex[] = "CenterTopicIndex"; static constexpr std::string_view CenterTopicIndex = "CenterTopicIndex";
static char const RightTopicIndex[] = "RightTopicIndex"; static constexpr std::string_view RightTopicIndex = "RightTopicIndex";
struct JournalWindowImpl : MWGui::JournalBooks, MWGui::JournalWindow struct JournalWindowImpl : MWGui::JournalBooks, MWGui::JournalWindow
{ {
@ -63,7 +63,7 @@ namespace
bool mAllQuests; bool mAllQuests;
template <typename T> template <typename T>
T* getWidget(char const* name) T* getWidget(std::string_view name)
{ {
T* widget; T* widget;
WindowBase::getWidget(widget, name); WindowBase::getWidget(widget, name);
@ -71,25 +71,25 @@ namespace
} }
template <typename value_type> template <typename value_type>
void setText(char const* name, value_type const& value) void setText(std::string_view name, value_type const& value)
{ {
getWidget<MyGUI::TextBox>(name)->setCaption(MyGUI::utility::toString(value)); getWidget<MyGUI::TextBox>(name)->setCaption(MyGUI::utility::toString(value));
} }
void setVisible(char const* name, bool visible) { getWidget<MyGUI::Widget>(name)->setVisible(visible); } void setVisible(std::string_view name, bool visible) { getWidget<MyGUI::Widget>(name)->setVisible(visible); }
void adviseButtonClick(char const* name, void (JournalWindowImpl::*handler)(MyGUI::Widget*)) void adviseButtonClick(std::string_view name, void (JournalWindowImpl::*handler)(MyGUI::Widget*))
{ {
getWidget<MyGUI::Widget>(name)->eventMouseButtonClick += newDelegate(this, handler); getWidget<MyGUI::Widget>(name)->eventMouseButtonClick += newDelegate(this, handler);
} }
void adviseKeyPress( void adviseKeyPress(
char const* name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char)) std::string_view name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char))
{ {
getWidget<MyGUI::Widget>(name)->eventKeyButtonPressed += newDelegate(this, handler); getWidget<MyGUI::Widget>(name)->eventKeyButtonPressed += newDelegate(this, handler);
} }
MWGui::BookPage* getPage(char const* name) { return getWidget<MWGui::BookPage>(name); } MWGui::BookPage* getPage(std::string_view name) { return getWidget<MWGui::BookPage>(name); }
JournalWindowImpl(MWGui::JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding) JournalWindowImpl(MWGui::JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
: JournalBooks(Model, encoding) : JournalBooks(Model, encoding)

Write Preview
Loading…
Cancel
Save