Skip to content

Y
ygopro
Commit dc9cf9a4 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'mercury/patch-irr-clipboard' into develop

parents ba4d2bd4 2e407cc7
Pipeline #43532 passed with stages
        in 4 minutes and 40 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 6 additions and 10 deletions
        .github/workflows/build.yml
        View file @ dc9cf9a4
        ...@@ -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: |
        ...@@ -659,7 +659,7 @@ jobs: ...@@ -659,7 +659,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 @ dc9cf9a4
        ...@@ -415,9 +415,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -415,9 +415,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;
        ...@@ -516,11 +514,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -516,11 +514,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