쿨다운 종료 후 눌러놨던 버튼으로 포커스 이동

김태훈
1 parent 347c468736
Showing 2 changed files with 9 additions and 0 deletions Show diff stats
app/gui/oven_control/washwindow.cpp
app/gui/oven_control/washwindow.h
@@ -140,6 +140,7 @@ void WashWindow::start(int type)
     if (udp->getData().sensor1 > 60)
     {
         state = CoolDown;
+        lastFocus = focusWidget();
  
         CooldownPopup *p = new CooldownPopup(this, 60);
         p->setWindowModality(Qt::WindowModal);
@@ -159,6 +160,12 @@ void WashWindow::start(int type)
  
 void WashWindow::resume()
 {
+    if (lastFocus)
+    {
+        lastFocus->setFocus();
+        lastFocus = NULL;
+    }
+
     if (udp->getData().door_state)
     {
         state = CloseDoor;
@@ -62,6 +62,8 @@ private:
     bool canceled;
     int type;
  
+    QWidget *lastFocus = NULL;
+
     QTimer returnToClockTimer;
  
     QWidget *pushed = NULL;
...	...	@@ -140,6 +140,7 @@ void WashWindow::start(int type)
140	140	if (udp->getData().sensor1 > 60)
141	141	{
142	142	state = CoolDown;
	143	+ lastFocus = focusWidget();
143	144
144	145	CooldownPopup *p = new CooldownPopup(this, 60);
145	146	p->setWindowModality(Qt::WindowModal);
...	...	@@ -159,6 +160,12 @@ void WashWindow::start(int type)
159	160
160	161	void WashWindow::resume()
161	162	{
	163	+ if (lastFocus)
	164	+ {
	165	+ lastFocus->setFocus();
	166	+ lastFocus = NULL;
	167	+ }
	168	+
162	169	if (udp->getData().door_state)
163	170	{
164	171	state = CloseDoor;
...	...
...	...	@@ -62,6 +62,8 @@ private:
62	62	bool canceled;
63	63	int type;
64	64
	65	+ QWidget *lastFocus = NULL;
	66	+
65	67	QTimer returnToClockTimer;
66	68
67	69	QWidget *pushed = NULL;
...	...