Skip to content

Y
ygopro
Commit abcfe67e authored by mercury233's avatar mercury233
Browse files
Options

update signature of copyToClipboard and getTextFromClipboard

parent bbd99ad4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
gframe/deck_con.cpp
View file @ abcfe67e
...@@ -414,9 +414,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -414,9 +414,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
case BUTTON_EXPORT_DECK_CODE: { case BUTTON_EXPORT_DECK_CODE: {
std::stringstream textStream; std::stringstream textStream;
deckManager.SaveDeck(deckManager.current_deck, textStream); deckManager.SaveDeck(deckManager.current_deck, textStream);
wchar_t text[0x10000]; mainGame->env->getOSOperator()->copyToClipboard(textStream.str().c_str());
BufferIO::DecodeUTF8(textStream.str().c_str(), text);
mainGame->env->getOSOperator()->copyToClipboard(text);
mainGame->stACMessage->setText(dataManager.GetSysString(1480)); mainGame->stACMessage->setText(dataManager.GetSysString(1480));
mainGame->PopupElement(mainGame->wACMessage, 20); mainGame->PopupElement(mainGame->wACMessage, 20);
break; break;
...@@ -515,11 +513,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -515,11 +513,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
deckManager.current_deck.extra.clear(); deckManager.current_deck.extra.clear();
deckManager.current_deck.side.clear(); deckManager.current_deck.side.clear();
} else { } else {
const wchar_t* txt = mainGame->env->getOSOperator()->getTextFromClipboard(); const char* txt = mainGame->env->getOSOperator()->getTextFromClipboard();
if(txt) { if(txt) {
char text[0x10000]; std::istringstream textStream(txt);
BufferIO::EncodeUTF8(txt, text);
std::istringstream textStream(text);
deckManager.LoadCurrentDeck(textStream); deckManager.LoadCurrentDeck(textStream);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment