theme tweaks

fix contextmenu appearing off-screen #220
easymodo · May 18, 2020 · ff1dfe9 · ff1dfe9
1 parent 13abbbe
commit ff1dfe9
Show file tree

Hide file tree

Showing 11 changed files with 1,125 additions and 1,057 deletions.
diff --git a/qimgv/gui/contextmenu.cpp b/qimgv/gui/contextmenu.cpp
@@ -112,6 +112,16 @@ void ContextMenu::showAt(QPoint pos) {
     show();
 }
 
+void ContextMenu::setGeometry(QRect geom) {
+    auto screen = QGuiApplication::primaryScreen();
+    // fit inside the current screen
+    if(geom.bottom() > screen->geometry().bottom())
+        geom.moveBottom(screen->geometry().bottom());
+    if(geom.right() > screen->geometry().right())
+        geom.moveRight(screen->geometry().right());
+    QWidget::setGeometry(geom);
+}
+
 void ContextMenu::mousePressEvent(QMouseEvent *event) {
     QWidget::mousePressEvent(event);
     hide();

diff --git a/qimgv/gui/contextmenu.h b/qimgv/gui/contextmenu.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QScreen>
 #include <QStyleOption>
 #include <QTimer>
 #include <QPainter>
@@ -18,6 +19,8 @@ class ContextMenu : public QWidget {
 
 public slots:
     void showAt(QPoint pos);
+    void setGeometry(QRect geom);
+
 private:
     Ui::ContextMenu *ui;
     QTimer mTimer;

diff --git a/qimgv/gui/customwidgets/thumbnailwidget.cpp b/qimgv/gui/customwidgets/thumbnailwidget.cpp
@@ -31,7 +31,7 @@ ThumbnailWidget::ThumbnailWidget(QGraphicsItem *parent) :
 
 void ThumbnailWidget::readSettings() {
     nameColor = settings->colorScheme().text;
-    highlightColor = settings->colorScheme().accent;
+    highlightColor = settings->colorScheme().accent_light;
 }
 
 void ThumbnailWidget::setThumbnailSize(int size) {

diff --git a/qimgv/gui/dialogs/settingsdialog.cpp b/qimgv/gui/dialogs/settingsdialog.cpp
@@ -37,6 +37,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 #endif
 
     setupSidebar();
+    ui->sideBar->setCurrentRow(0);
 
     connect(this, &SettingsDialog::settingsChanged, settings, &Settings::sendChangeNotification);
     readSettings();