Skip to content

Y
ygopro
Commit d16f7d48 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'patch-irr-clipboard' of github.com:mercury233/ygopro into develop

parents d2d7108d 2e407cc7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
.github/workflows/build.yml
View file @ d16f7d48
...@@ -196,7 +196,7 @@ jobs: ...@@ -196,7 +196,7 @@ jobs:
- name: Download irrlicht - name: Download irrlicht
run: | run: |
git clone --depth=1 https://github.com/mercury233/irrlicht git clone --depth=1 -b patch-clipboard https://github.com/mercury233/irrlicht
- name: Check DirectX SDK - name: Check DirectX SDK
if: matrix.nodxsdk != true if: matrix.nodxsdk != true
...@@ -437,7 +437,7 @@ jobs: ...@@ -437,7 +437,7 @@ jobs:
- name: Download irrlicht - name: Download irrlicht
run: | run: |
git clone --depth=1 https://github.com/mercury233/irrlicht git clone --depth=1 -b patch-clipboard https://github.com/mercury233/irrlicht
- name: Copy premake files - name: Copy premake files
run: | run: |
...@@ -653,7 +653,7 @@ jobs: ...@@ -653,7 +653,7 @@ jobs:
- name: Download irrlicht - name: Download irrlicht
run: | run: |
git clone --depth=1 https://github.com/mercury233/irrlicht git clone --depth=1 -b patch-clipboard https://github.com/mercury233/irrlicht
- name: Copy premake files - name: Copy premake files
run: | run: |
......
gframe/deck_con.cpp
View file @ d16f7d48
...@@ -459,9 +459,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -459,9 +459,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;
...@@ -560,11 +558,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -560,11 +558,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