diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 17:02:32 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 17:02:32 -0500 |
| commit | 156a760ebab6839c53f9c613881f0937e814414a (patch) | |
| tree | fd9fafecd25fbd66f0e4f8101f856c8cf68b790e /src/aoimage.cpp | |
| parent | d89a4370a753f6e1da22349866b1b00f638884a6 (diff) | |
Full revert to tag 2.6.2
Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).
Changes dropped include:
- Witness needed
- Shake
- Frame SFX
- Multiple custom objections
- Multithreaded thumbnail generation
- Looping
- Various translation additions
- "Mirror IC"
- Color in IC log
- An invocation of clang-format
Next time, work together and split your big fork into independently
testable feature branches.
Diffstat (limited to 'src/aoimage.cpp')
| -rw-r--r-- | src/aoimage.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/aoimage.cpp b/src/aoimage.cpp index ffdf25aa..7bb56bb6 100644 --- a/src/aoimage.cpp +++ b/src/aoimage.cpp @@ -8,7 +8,10 @@ AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent) ao_app = p_ao_app; } -AOImage::~AOImage() {} +AOImage::~AOImage() +{ + +} void AOImage::set_image(QString p_image) { @@ -24,8 +27,7 @@ void AOImage::set_image(QString p_image) QPixmap f_pixmap(final_image_path); - this->setPixmap( - f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); + this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); } void AOImage::set_image_from_path(QString p_path) @@ -41,6 +43,5 @@ void AOImage::set_image_from_path(QString p_path) QPixmap f_pixmap(final_path); - this->setPixmap( - f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); + this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); } |
