kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ios] Fixed hang up while switching from guide to maps

Browse source 
Revert "[ios] Fix slow switching from GuideView to MapView, when before GuideView was swtiched during a long redraw. Kudos to Sergey!"

This reverts commit 06441c788d8243150fd44c6a5028f2b29ca1cf1b.
This commit is contained in:
Alex Zolotarev 2011-04-08 01:16:19 +02:00 • committed by Alex Zolotarev
parent 4f2c70ffd1
commit 3fbc92cb54
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
iphone/Maps/Classes/MapViewController.mm
View file

@ -396,18 +396,8 @@ NSInteger compareAddress(UITouch * l, UITouch * r, void * context)
{
if (m_framework)
{
LOG(LINFO, ("Invalidate: [self.view drawView]"));
[(EAGLView *)self.view drawView];
LOG(LINFO, ("Invalidate: m_framework->SetUpdatesEnabled(true)"));
m_framework->SetUpdatesEnabled(true);
LOG(LINFO, ("Invalidate: done."));
// The code below causes very long response time when switching from GuideView to MapView,
// if before there was a long redraw on MapView to GuideView switch.
//
// if (!m_framework->SetUpdatesEnabled(true))
// m_framework->Invalidate();
// LOG(LINFO, ("Invalidate done."));
if (!m_framework->SetUpdatesEnabled(true))
m_framework->Invalidate();
}
}

4
iphone/Maps/MainWindow.xib
View file

@ -51,7 +51,6 @@
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -61,6 +60,7 @@
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIVisibleAtLaunch">YES</bool>
<bool key="IBUIResizesToFullScreen">YES</bool>
</object>
<object class="IBUIViewController" id="963277495">
<object class="IBUIView" key="IBUIView" id="53915144">
@ -78,7 +78,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{90, 8}, {140, 30}}</string>
<reference key="NSSuperview" ref="353555995"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBSegmentControlStyle">2</int>
@ -168,6 +167,7 @@
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIToolbarItems" ref="0"/>

1
iphone/Maps/Resources-iPad/MainWindow-iPad.xib
View file

@ -167,6 +167,7 @@
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<reference key="IBUIToolbarItems" ref="0"/>