From c7bb0f62d91c9803fd3e2f5b3017d84e6750e833 Mon Sep 17 00:00:00 2001
From: soramimi <fi7s-fct@asahi-net.or.jp>
Date: Tue, 15 Aug 2023 02:42:13 +0900
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E3=81=AE=E3=82=A2=E3=82=A4?=
 =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=92=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8DConfigUser=E3=83=80?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MainWindow.cpp        |  5 +++--
 src/SimpleImageWidget.cpp | 24 ++++++++++++++++++++++--
 src/SimpleImageWidget.h   | 11 +++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a7ee1523..e0cbe534 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -283,6 +283,9 @@ MainWindow::MainWindow(QWidget *parent)
 		ui->lineEdit_remote->setText(currentRemoteName());
 	});
 
+	// 右上のアイコンがクリックされたとき、ConfigUserダイアログを表示
+	connect(ui->widget_avatar_icon, &SimpleImageWidget::clicked, this, &MainWindow::on_action_configure_user_triggered);
+
 	connect(new QShortcut(QKeySequence("Ctrl+T"), this), &QShortcut::activated, this, &MainWindow::test);
 
 	//
@@ -5633,8 +5636,6 @@ void MainWindow::on_action_configure_user_triggered()
 	execConfigUserDialog(global_user, local_user, enable_local_user, currentRepositoryName());
 }
 
-
-
 void MainWindow::showLogWindow(bool show)
 {
 	ui->dockWidget_log->setVisible(show);
diff --git a/src/SimpleImageWidget.cpp b/src/SimpleImageWidget.cpp
index fad56d82..41d073c4 100644
--- a/src/SimpleImageWidget.cpp
+++ b/src/SimpleImageWidget.cpp
@@ -1,21 +1,31 @@
 #include "SimpleImageWidget.h"
-
+#include <QDebug>
+#include <QMouseEvent>
 #include <QPainter>
 
 SimpleImageWidget::SimpleImageWidget(QWidget *parent)
 	: QWidget{parent}
 {
-
 }
 
+/**
+ * @brief 画像を設定
+ * @param image
+ */
 void SimpleImageWidget::setImage(const QImage &image)
 {
 	image_ = image;
 	update();
 }
 
+/**
+ * @brief SimpleImageWidget::paintEvent
+ * @param event
+ */
 void SimpleImageWidget::paintEvent(QPaintEvent *event)
 {
+	// ウィンドウに内接するように画像を描画
+
 	int dw = width();
 	int dh = height();
 	if (dw < 1 || dh < 1) return;
@@ -37,3 +47,13 @@ void SimpleImageWidget::paintEvent(QPaintEvent *event)
 	pr.drawImage(QRect(x, y, dw, dh), image_, QRect(0, 0, sw, sh));
 }
 
+void SimpleImageWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+	// マウス左ボタンが離されたときウィンドウ座標内ならクリックされたことにする
+	if (event->button() == Qt::LeftButton) {
+		if (rect().contains(event->pos())) {
+			emit clicked();
+		}
+	}
+}
+
diff --git a/src/SimpleImageWidget.h b/src/SimpleImageWidget.h
index 6b37b932..f0dc801e 100644
--- a/src/SimpleImageWidget.h
+++ b/src/SimpleImageWidget.h
@@ -5,13 +5,16 @@
 
 class SimpleImageWidget : public QWidget {
 	Q_OBJECT
-private:
-	QImage image_;
-protected:
-	void paintEvent(QPaintEvent *event);
 public:
 	explicit SimpleImageWidget(QWidget *parent = nullptr);
 	void setImage(QImage const &image);
+protected:
+	void paintEvent(QPaintEvent *event);
+	void mouseReleaseEvent(QMouseEvent *event);
+private:
+	QImage image_;
+signals:
+	void clicked();
 };
 
 #endif // SIMPLEIMAGEWIDGET_H