noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only try to extract images if the image uploader is enabled (#4246)

Browse source 
* Only try to extract images if the image uploader is enabled

* Add changelog entry
This commit is contained in:
pajlada 2022-12-25 13:14:23 +01:00 committed by GitHub
parent fdb0a1582c
commit a9a985bde1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@
- Bugfix: Fixed unnecessary saving of windows layout. (#4201)
- Bugfix: Fixed Reply window missing selection clear behaviour between chat and input box. (#4218)
- Bugfix: Fixed crash that could occur when changing Tab layout and utilizing multiple windows. (#4248)
- Bugfix: Fixed text sometimes not pasting properly when image uploader was disabled. (#4246)
- Dev: Remove protocol from QApplication's Organization Domain (so changed from `https://www.chatterino.com` to `chatterino.com`). (#4256)
- Dev: Ignore `WM_SHOWWINDOW` hide events, causing fewer attempted rescales. (#4198)
- Dev: Migrated to C++ 20 (#4252, #4257)

43
src/widgets/helper/ResizingTextEdit.cpp
View file

@ -286,31 +286,34 @@ bool ResizingTextEdit::canInsertFromMimeData(const QMimeData *source) const
void ResizingTextEdit::insertFromMimeData(const QMimeData *source)
{
if (source->hasImage())
if (getSettings()->imageUploaderEnabled)
{
this->imagePasted.invoke(source);
return;
}
if (source->hasUrls())
{
bool hasUploadable = false;
auto mimeDb = QMimeDatabase();
for (const QUrl &url : source->urls())
{
QMimeType mime = mimeDb.mimeTypeForUrl(url);
if (mime.name().startsWith("image"))
{
hasUploadable = true;
break;
}
}
if (hasUploadable)
if (source->hasImage())
{
this->imagePasted.invoke(source);
return;
}
if (source->hasUrls())
{
bool hasUploadable = false;
auto mimeDb = QMimeDatabase();
for (const QUrl &url : source->urls())
{
QMimeType mime = mimeDb.mimeTypeForUrl(url);
if (mime.name().startsWith("image"))
{
hasUploadable = true;
break;
}
}
if (hasUploadable)
{
this->imagePasted.invoke(source);
return;
}
}
}
insertPlainText(source->text());