amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

prevent drag and drop from within the same card list

Browse Source
This commit is contained in:
GenevensiS
2025-12-03 17:50:48 +01:00
parent 2d6c0d2aee
commit f22046d77b
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/format/clipboard.cpp
+9 -6
View File
@@ -45,6 +45,7 @@ void deserialize_from_clipboard(T& object, Package& package, const String& data)
struct WrappedCards {
Game* expected_game;
String game_name;
String id;
vector<CardP> cards;
DECLARE_REFLECTION();
@@ -52,6 +53,7 @@ struct WrappedCards {
IMPLEMENT_REFLECTION(WrappedCards) {
REFLECT(game_name);
REFLECT(id);
if (game_name == expected_game->name()) {
WITH_DYNAMIC_ARG(game_for_reading, expected_game);
REFLECT(cards);
@@ -61,7 +63,7 @@ IMPLEMENT_REFLECTION(WrappedCards) {
wxDataFormat CardsDataObject::format = _("application/x-mse-cards");
CardsDataObject::CardsDataObject(const SetP& set, const vector<CardP>& cards) {
CardsDataObject::CardsDataObject(const SetP& set, const String id, const vector<CardP>& cards) {
// set the stylesheet, so when deserializing we know whos style options we are reading
vector<bool> has_styling;
for (size_t i = 0 ; i < cards.size() ; ++i) {
@@ -70,7 +72,7 @@ CardsDataObject::CardsDataObject(const SetP& set, const vector<CardP>& cards) {
cards[i]->stylesheet = set->stylesheet;
}
}
WrappedCards data = { set->game.get(), set->game->name(), cards };
WrappedCards data = { set->game.get(), set->game->name(), id, cards };
SetText(serialize_for_clipboard(*set, data));
// restore cards
for (size_t i = 0 ; i < cards.size() ; ++i) {
@@ -85,10 +87,11 @@ CardsDataObject::CardsDataObject() {
SetFormat(format);
}
bool CardsDataObject::getCards(const SetP& set, vector<CardP>& out) {
bool CardsDataObject::getCards(const SetP& set, const String id, vector<CardP>& out) {
WrappedCards data = { set->game.get(), set->game->name() };
deserialize_from_clipboard(data, *set, GetText());
if (data.cards.empty()) return false;
if (!id.empty() && data.id == id) return false;
if (data.game_name == set->game->name()) {
// Cards are from the same game
out = data.cards;
@@ -140,7 +143,7 @@ KeywordP KeywordDataObject::getKeyword(const SetP& set) {
// ----------------------------------------------------------------------------- : Card on clipboard
CardsOnClipboard::CardsOnClipboard(const SetP& set, const vector<CardP>& cards) {
CardsOnClipboard::CardsOnClipboard(const SetP& set, const String id, const vector<CardP>& cards) {
// Conversion to image file
if (cards.size() < 6) {
Image img;
@@ -156,6 +159,6 @@ CardsOnClipboard::CardsOnClipboard(const SetP& set, const vector<CardP>& cards)
data->AddFile(temp_path);
Add(data);
}
// Conversion to serialized card format
Add(new CardsDataObject(set, cards), true);
// Conversion to serialized card format
Add(new CardsDataObject(set, id, cards), true);
}
src/data/format/clipboard.hpp
+5 -4
View File
@@ -25,11 +25,12 @@ public:
CardsDataObject();
/// Store a card
CardsDataObject(const SetP& set, const vector<CardP>& cards);
CardsDataObject(const SetP& set, const String id, const vector<CardP>& cards);
/// Retrieve the cards, only if it is made with the same game as set
/// Retrieve the cards, only if this is made with the same game as set
/// And if this is NOT of the same id as the given one
/** Return true if the cards are correctly retrieved, and there is at least one card */
bool getCards(const SetP& set, vector<CardP>& out);
bool getCards(const SetP& set, const String id, vector<CardP>& out);
};
// ----------------------------------------------------------------------------- : KeywordDataObject
@@ -53,6 +54,6 @@ public:
/// A DataObject for putting one or more cards on the clipboard, in multiple formats
class CardsOnClipboard : public wxDataObjectComposite {
public:
CardsOnClipboard(const SetP& set, const vector<CardP>& cards);
CardsOnClipboard(const SetP& set, const String id, const vector<CardP>& cards);
};