merge with dev...

This commit is contained in:
Desmis
2017-06-19 12:30:20 +02:00
90 changed files with 598 additions and 866 deletions

View File

@@ -1153,7 +1153,7 @@ OPIcon::OPIcon (const Cairo::RefPtr<Cairo::ImageSurface> &normal,
}
if (dragged) {
draggedImg = active;
draggedImg = dragged;
}
if (insensitive) {