Merge pull request #34 from baranovskiykonstantin/softkeys_fix

Do not hide softkeys at orientation changing.
artem78 · Jul 31, 2021 · 75a93bc · 75a93bc
2 parents 2bbb241 + 8518592
commit 75a93bc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/inc/S60MapsAppView.h b/inc/S60MapsAppView.h
@@ -180,6 +180,8 @@ class CS60MapsAppView : public CCoeControlWithDelayedDraw
 	TS60MapsMovement iMovement;
 	CPeriodic* iMovementRepeater;
 
+	TBool iIsSoftkeysShown;
+
 	void Move(const TPoint &aPoint, TBool savePos = ETrue); // Used by all another Move methods
 public:
 	void Move(const TCoordinate &aPos);
@@ -227,6 +229,8 @@ class CS60MapsAppView : public CCoeControlWithDelayedDraw
 	inline TBool IsFollowingUser()
 		{ return iIsFollowUser; };
 	void SetTileProviderL(TTileProvider* aTileProvider);
+	inline TBool IsSoftkeysShown()
+		{ return iIsSoftkeysShown; };
 
 	};
 

diff --git a/src/S60MapsAppUi.cpp b/src/S60MapsAppUi.cpp
@@ -275,6 +275,7 @@ void CS60MapsAppUi::HandleCommandL(TInt aCommand)
 			break;
 		}
 	}
+
 // -----------------------------------------------------------------------------
 //  Called by the framework when the application status pane
 //  size is changed.  Passes the new client rectangle to the
@@ -283,8 +284,14 @@ void CS60MapsAppUi::HandleCommandL(TInt aCommand)
 //
 void CS60MapsAppUi::HandleStatusPaneSizeChange()
 	{
-	//iAppView->SetRect(ClientRect());
-	iAppView->SetRect(ApplicationRect());
+	if (iAppView->IsSoftkeysShown())
+		{
+		iAppView->SetRect(ClientRect());
+		}
+	else
+		{
+		iAppView->SetRect(ApplicationRect());
+		}
 	}
 
 CArrayFix<TCoeHelpContext>* CS60MapsAppUi::HelpContextL() const

diff --git a/src/S60MapsAppView.cpp b/src/S60MapsAppView.cpp
@@ -154,7 +154,8 @@ void CS60MapsAppView::ConstructL(const TRect& aRect, const TCoordinate &aInitial
 // -----------------------------------------------------------------------------
 //
 CS60MapsAppView::CS60MapsAppView(TZoom aInitialZoom) :
-	iZoom(aInitialZoom)
+	iZoom(aInitialZoom),
+	iIsSoftkeysShown(EFalse)
 	// Position will be set later in ConstructL
 	{
 	// No implementation required
@@ -320,10 +321,12 @@ void CS60MapsAppView::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 			if (posDelta.iY < 0)
 				{
 				SetRect(iAvkonAppUi->ClientRect());
+				iIsSoftkeysShown = ETrue;
 				}
 			else
 				{
 				SetRect(iAvkonAppUi->ApplicationRect());
+				iIsSoftkeysShown = EFalse;
 				}
 			}
 		else