Skip to content

Fixed map view zoom direction is inverted for scroll and multitouch p… #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ibobalo wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Fixed map view zoom direction is inverted for scroll and multitouch p… #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a84a17b
Fixed mbtiles source lazy map invocation under python 3
Sep 1, 2020
c04f422
Fixed mapview input processing when widget is disabled
Sep 1, 2020
2e47891
Fixed map view zoom direction is inverted for scroll and multitouch p…
Sep 1, 2020
c18cf1f
Fixed map view zoom direction is inverted for scroll and multitouch p…
Sep 1, 2020
c6bbad6
Merge branch 'master' into develop
Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kivy_garden/mapview/mbtsource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def __init__(self, filename, **kwargs):
cx = cy = 0.0
cz = 5
if "bounds" in metadata:
self.bounds = bounds = map(float, metadata["bounds"].split(","))
self.bounds = bounds = list(map(float, metadata["bounds"].split(",")))
if "center" in metadata:
cx, cy, cz = map(float, metadata["center"].split(","))
cx, cy, cz = list(map(float, metadata["center"].split(",")))
elif self.bounds:
cx = (bounds[2] + bounds[0]) / 2.0
cy = (bounds[3] + bounds[1]) / 2.0
Expand Down
4 changes: 2 additions & 2 deletions kivy_garden/mapview/view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,12 +642,12 @@ def scale_at(self, scale, x, y):
)

def on_touch_down(self, touch):
if not self.collide_point(*touch.pos):
if not self.collide_point(*touch.pos) or self.disabled:
return
if self.pause_on_action:
self._pause = True
if "button" in touch.profile and touch.button in ("scrolldown", "scrollup"):
d = 1 if touch.button == "scrollup" else -1
d = 1 if touch.button == "scrolldown" else -1
self.animated_diff_scale_at(d, *touch.pos)
return True
elif touch.is_double_tap and self.double_tap_zoom:
Expand Down