mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 02:03:12 +02:00
Fix image pasting for MacOS
Apparently, GetImage() on MacOS does not always convert the image properly. So do a two-step here to get the Bitmap first, forcing the conversion and then going back to an image
This commit is contained in:
parent
f84ba3004d
commit
9f06d1f66b
@ -24,6 +24,7 @@
|
|||||||
#include "clipboard.h"
|
#include "clipboard.h"
|
||||||
|
|
||||||
#include <wx/clipbrd.h>
|
#include <wx/clipbrd.h>
|
||||||
|
#include <wx/dataobj.h>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
#include <wx/log.h>
|
#include <wx/log.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
@ -90,10 +91,10 @@ std::unique_ptr<wxImage> GetImageFromClipboard()
|
|||||||
{
|
{
|
||||||
if( wxTheClipboard->IsSupported( wxDF_BITMAP ) )
|
if( wxTheClipboard->IsSupported( wxDF_BITMAP ) )
|
||||||
{
|
{
|
||||||
wxImageDataObject data;
|
wxBitmapDataObject data;
|
||||||
if( wxTheClipboard->GetData( data ) )
|
if( wxTheClipboard->GetData( data ) )
|
||||||
{
|
{
|
||||||
image = std::make_unique<wxImage>( data.GetImage() );
|
image = std::make_unique<wxImage>( data.GetBitmap().ConvertToImage() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if( wxTheClipboard->IsSupported( wxDF_FILENAME ) )
|
else if( wxTheClipboard->IsSupported( wxDF_FILENAME ) )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user