rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove some hack code #2909

This commit is contained in:
Jerry (Xinyu Hou) 2015-12-02 10:28:11 -08:00 committed by Xinyu Hou
parent 221a9a71c4
commit 4344b16a20
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/platform/OSXClipboard.cpp
View File

@ -95,7 +95,6 @@ OSXClipboard::synchronize()
void void
OSXClipboard::add(EFormat format, const String & data) OSXClipboard::add(EFormat format, const String & data)
{ {
bool emptied = false;
if (m_pboard == NULL) if (m_pboard == NULL)
return; return;
@ -121,24 +120,16 @@ OSXClipboard::add(EFormat format, const String & data)
CFStringRef flavorType = converter->getOSXFormat(); CFStringRef flavorType = converter->getOSXFormat();
CFDataRef dataRef = CFDataCreate(kCFAllocatorDefault, (UInt8 *)osXData.data(), osXData.size()); CFDataRef dataRef = CFDataCreate(kCFAllocatorDefault, (UInt8 *)osXData.data(), osXData.size());
// integ tests showed that if you call add(...) twice, then the PasteboardPutItemFlavor(
// second call will actually fail to set clipboard data. calling m_pboard,
// empty() seems to solve this problem. but, only clear the clipboard (PasteboardItemID) 0,
// for the first converter, otherwise further converters will wipe out flavorType,
// what we just added. dataRef,
if (!emptied) { kPasteboardFlavorNoFlags);
empty();
emptied = true; LOG((CLOG_DEBUG "added %d bytes to clipboard format: %d", data.size(), format));
} }
PasteboardPutItemFlavor(
m_pboard,
(PasteboardItemID) 0,
flavorType,
dataRef,
kPasteboardFlavorNoFlags);
LOG((CLOG_DEBUG "added %d bytes to clipboard format: %d", data.size(), format));
}
} }
} }