From 374ad0a816c039dff3daf54a8d77139350bddaab Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 29 Aug 2021 17:22:49 +0200
Subject: Small image pack editor improvements

- add missing mimetype
- allow removal of images from pack
- allow GIF as a format
- don't divide size by 2 if the image is very small already
---
 src/SingleImagePackModel.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/SingleImagePackModel.cpp')

diff --git a/src/SingleImagePackModel.cpp b/src/SingleImagePackModel.cpp
index 4eb120d9..6d0f0ad9 100644
--- a/src/SingleImagePackModel.cpp
+++ b/src/SingleImagePackModel.cpp
@@ -310,11 +310,15 @@ SingleImagePackModel::addStickers(QList<QUrl> files)
                 auto sz = img.size() / 2;
                 if (sz.width() > 512 || sz.height() > 512) {
                         sz.scale(512, 512, Qt::AspectRatioMode::KeepAspectRatio);
+                } else if (img.height() < 128 && img.width() < 128) {
+                        sz = img.size();
                 }
 
                 info.h    = sz.height();
                 info.w    = sz.width();
                 info.size = bytes.size();
+                info.mimetype =
+                  QMimeDatabase().mimeTypeForFile(f.toLocalFile()).name().toStdString();
 
                 auto filename = f.fileName().toStdString();
                 http::client()->upload(
@@ -334,6 +338,19 @@ SingleImagePackModel::addStickers(QList<QUrl> files)
                   });
         }
 }
+
+void
+SingleImagePackModel::remove(int idx)
+{
+        if (idx < (int)shortcodes.size() && idx >= 0) {
+                beginRemoveRows(QModelIndex(), idx, idx);
+                auto s = shortcodes.at(idx);
+                shortcodes.erase(shortcodes.begin() + idx);
+                pack.images.erase(s);
+                endRemoveRows();
+        }
+}
+
 void
 SingleImagePackModel::addImageCb(std::string uri, std::string filename, mtx::common::ImageInfo info)
 {
-- 
cgit 1.5.1