Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
appinventor-sources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
appinventor-sources
Commits
5546b4d4
Unverified
Commit
5546b4d4
authored
May 11, 2021
by
Himanshu Garg
Committed by
GitHub
May 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix errors of map components in the designer (#2485)
parent
e870364f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
1 deletion
+26
-1
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockCircle.java
...pinventor/client/editor/simple/components/MockCircle.java
+4
-0
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockLineString.java
...entor/client/editor/simple/components/MockLineString.java
+4
-0
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java
...r/client/editor/simple/components/MockMapFeatureBase.java
+6
-1
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMarker.java
...pinventor/client/editor/simple/components/MockMarker.java
+4
-0
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockPolygon.java
...inventor/client/editor/simple/components/MockPolygon.java
+4
-0
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockRectangle.java
...ventor/client/editor/simple/components/MockRectangle.java
+4
-0
No files found.
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockCircle.java
View file @
5546b4d4
...
@@ -219,6 +219,10 @@ public class MockCircle extends MockMapFeatureBaseWithFill {
...
@@ -219,6 +219,10 @@ public class MockCircle extends MockMapFeatureBaseWithFill {
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getTooltip()()
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getTooltip()()
);
);
var isVisible = this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getVisibleProperty()();
if (!isVisible) {
map.removeLayer(circle);
}
}-*/
;
}-*/
;
}
}
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockLineString.java
View file @
5546b4d4
...
@@ -143,6 +143,10 @@ public class MockLineString extends MockMapFeatureBase {
...
@@ -143,6 +143,10 @@ public class MockLineString extends MockMapFeatureBase {
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getTooltip()()
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getTooltip()()
);
);
var isVisible = this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getVisibleProperty()();
if (!isVisible) {
map.removeLayer(polyline);
}
}-*/
;
}-*/
;
private
native
void
preserveLayerData
()
/*-{
private
native
void
preserveLayerData
()
/*-{
...
...
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java
View file @
5546b4d4
...
@@ -74,7 +74,12 @@ public abstract class MockMapFeatureBase extends MockVisibleComponent implements
...
@@ -74,7 +74,12 @@ public abstract class MockMapFeatureBase extends MockVisibleComponent implements
protected
void
onSelectedChange
(
boolean
selected
)
{
protected
void
onSelectedChange
(
boolean
selected
)
{
super
.
onSelectedChange
(
selected
);
super
.
onSelectedChange
(
selected
);
setSelected
(
selected
);
setSelected
(
selected
);
setEditing
(
selected
);
boolean
isVisible
=
getVisibleProperty
();
setEditing
(
isVisible
&&
selected
);
}
boolean
getVisibleProperty
()
{
return
Boolean
.
parseBoolean
(
getPropertyValue
(
PROPERTY_NAME_VISIBLE
));
}
}
@Override
@Override
...
...
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMarker.java
View file @
5546b4d4
...
@@ -430,6 +430,10 @@ public class MockMarker extends MockMapFeatureBaseWithFill {
...
@@ -430,6 +430,10 @@ public class MockMarker extends MockMapFeatureBaseWithFill {
marker.on('click dragstart', marker.clickHandler);
marker.on('click dragstart', marker.clickHandler);
marker.on('dragend', marker.dragHandler);
marker.on('dragend', marker.dragHandler);
}
}
var isVisible = this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getVisibleProperty()();
if (!isVisible) {
map.removeLayer(marker);
}
}-*/
;
}-*/
;
native
double
getLatitude
()
/*-{
native
double
getLatitude
()
/*-{
...
...
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockPolygon.java
View file @
5546b4d4
...
@@ -215,6 +215,10 @@ public class MockPolygon extends MockPolygonBase {
...
@@ -215,6 +215,10 @@ public class MockPolygon extends MockPolygonBase {
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockPolygon::getTooltip()()
this.@com.google.appinventor.client.editor.simple.components.MockPolygon::getTooltip()()
);
);
var isVisible = this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getVisibleProperty()();
if (!isVisible) {
map.removeLayer(polygon);
}
}-*/
;
}-*/
;
private
native
void
preserveLayerData
()
/*-{
private
native
void
preserveLayerData
()
/*-{
...
...
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockRectangle.java
View file @
5546b4d4
...
@@ -184,6 +184,10 @@ public class MockRectangle extends MockPolygonBase {
...
@@ -184,6 +184,10 @@ public class MockRectangle extends MockPolygonBase {
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::setNativeTooltip(*)(
this.@com.google.appinventor.client.editor.simple.components.MockPolygon::getTooltip()()
this.@com.google.appinventor.client.editor.simple.components.MockPolygon::getTooltip()()
);
);
var isVisible = this.@com.google.appinventor.client.editor.simple.components.MockMapFeatureBase::getVisibleProperty()();
if (!isVisible) {
map.removeLayer(rect);
}
}-*/
;
}-*/
;
private
native
void
setBounds
(
double
south
,
double
west
,
double
north
,
double
east
)
/*-{
private
native
void
setBounds
(
double
south
,
double
west
,
double
north
,
double
east
)
/*-{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment