mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-17 22:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11/skia: Add Display::setIcons() impl

Browse Source
This commit is contained in:
David Capello 2018-08-08 18:45:32 -03:00
parent c5f6299df4
commit 6dd025ae7b
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/she/skia/skia_display.cpp
View File

@ -139,7 +139,9 @@ void SkiaDisplay::setTitleBar(const std::string& title)
void SkiaDisplay::setIcons(const SurfaceList& icons)
{
// TODO copy the Allegro impl
#if !defined(_WIN32) && !defined(__APPLE__)
m_window.setIcons(icons);
#endif
}
NativeCursor SkiaDisplay::nativeMouseCursor()

40
src/she/x11/window.cpp
View File

@ -201,6 +201,46 @@ void X11Window::setTitle(const std::string& title)
XSetWMName(m_display, m_window, &prop);
}
void X11Window::setIcons(const SurfaceList& icons)
{
if (!m_display || !m_window)
return;
bool first = true;
for (Surface* icon : icons) {
const int w = icon->width();
const int h = icon->height();
SurfaceFormatData format;
icon->getFormat(&format);
std::vector<unsigned long> data(w*h+2);
int i = 0;
data[i++] = w;
data[i++] = h;
for (int y=0; y<h; ++y) {
const uint32_t* p = (const uint32_t*)icon->getData(0, y);
for (int x=0; x<w; ++x, ++p) {
uint32_t c = *p;
data[i++] =
(((c & format.blueMask ) >> format.blueShift ) ) |
(((c & format.greenMask) >> format.greenShift) << 8) |
(((c & format.redMask ) >> format.redShift ) << 16) |
(((c & format.alphaMask) >> format.alphaShift) << 24);
}
}
Atom _NET_WM_ICON = XInternAtom(m_display, "_NET_WM_ICON", False);
XChangeProperty(
m_display, m_window, _NET_WM_ICON, XA_CARDINAL, 32,
first ? PropModeReplace:
PropModeAppend,
(const unsigned char*)&data[0], data.size());
first = false;
}
}
gfx::Size X11Window::clientSize() const
{
Window root;

2
src/she/x11/window.h
View File

@ -11,6 +11,7 @@
#include "gfx/fwd.h"
#include "gfx/size.h"
#include "she/native_cursor.h"
#include "she/surface_list.h"
#include <X11/Xatom.h>
#include <X11/Xcursor/Xcursor.h>
@ -34,6 +35,7 @@ public:
void setScale(const int scale);
void setTitle(const std::string& title);
void setIcons(const SurfaceList& icons);
gfx::Size clientSize() const;
gfx::Size restoredSize() const;