drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Follow up after trackVisibleViewport=true.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-09-11 08:59:05 -03:00
committed by x7z4w
parent 428ff30af7
commit 30f624a070
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -42,7 +42,6 @@ import androidx.annotation.CallSuper;
import androidx.annotation.Keep; import androidx.annotation.Keep;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
@@ -719,16 +718,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void showPositionChooser(ChoosePositionMode mode, boolean isBusiness, boolean applyPosition) private void showPositionChooser(ChoosePositionMode mode, boolean isBusiness, boolean applyPosition)
{ {
closeFloatingToolbarsAndPanels(false); closeFloatingToolbarsAndPanels(false);
if (mMapFragment != null)
{
final View mapView = mMapFragment.getView();
if (mapView != null)
{
int width = mapView.getWidth();
int height = mapView.getHeight();
Framework.nativeSetVisibleRect(0, 0, width, height);
}
}
UiUtils.show(mPointChooser); UiUtils.show(mPointChooser);
mMapButtonsViewModel.setButtonsHidden(true); mMapButtonsViewModel.setButtonsHidden(true);
ChoosePositionMode.set(mode, isBusiness, applyPosition); ChoosePositionMode.set(mode, isBusiness, applyPosition);

4
libs/drape_frontend/frontend_renderer.cpp
View File

@@ -825,7 +825,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(msg->GetRect())); AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(msg->GetRect()));
m_myPositionController->SetVisibleViewport(msg->GetRect()); m_myPositionController->SetVisibleViewport(msg->GetRect());
m_myPositionController->UpdatePosition(); m_myPositionController->UpdatePosition();
PullToBoundArea(false /* randomPlace */, false /* applyZoom */); // PullToBoundArea(false /* randomPlace */, false /* applyZoom */);
break; break;
} }
@@ -2056,7 +2056,7 @@ void FrontendRenderer::OnScaleEnded()
void FrontendRenderer::OnAnimatedScaleEnded() void FrontendRenderer::OnAnimatedScaleEnded()
{ {
m_myPositionController->ResetBlockAutoZoomTimer(); m_myPositionController->ResetBlockAutoZoomTimer();
PullToBoundArea(false /* randomPlace */, false /* applyZoom */); // PullToBoundArea(false /* randomPlace */, false /* applyZoom */);
m_firstLaunchAnimationInterrupted = true; m_firstLaunchAnimationInterrupted = true;
m_selectionTrackInfo.reset(); m_selectionTrackInfo.reset();
} }