[[ BrowserWidget ]] Split libbrowser "scrollbars" property to "verticalScrollbarEnabled" and "horizontalScrollbarEnabled"

livecodeian · livecodeian · commit 0cc73d4285df · 2015-10-28T10:21:46.000Z
diff --git a/engine/src/java/com/runrev/android/libraries/LibBrowser.java b/engine/src/java/com/runrev/android/libraries/LibBrowser.java
@@ -150,8 +150,6 @@ class LibBrowserWebView extends WebView
 {
 	public static final String TAG = "revandroid.LibBrowserWebView";
 	
-	private boolean m_scrolling_enabled;
-
 	private VideoView m_custom_video_view;
 	private FrameLayout m_custom_view_container;
 	private WebChromeClient.CustomViewCallback m_custom_view_callback;
@@ -164,8 +162,6 @@ public LibBrowserWebView(Context p_context)
 	{
 		super(p_context);
 		
-		m_scrolling_enabled = true;
-
 		setWebViewClient(new WebViewClient() {
 			public boolean shouldOverrideUrlLoading(WebView p_view, String p_url)
 			{
@@ -427,30 +423,24 @@ public void setUrl(String p_url)
 	//	return toAPKPath(super.getUrl());
 	//}
 
-	public boolean getScrollingEnabled()
+	public boolean getVerticalScrollbarEnabled()
 	{
-		return m_scrolling_enabled;
+		return isVerticalScrollBarEnabled();
 	}
 	
-	public void setScrollingEnabled(boolean p_enabled)
+	public void setVerticalScrollbarEnabled(boolean p_enabled)
 	{
-		if (m_scrolling_enabled == p_enabled)
-			return;
-		m_scrolling_enabled = p_enabled;
-		setHorizontalScrollBarEnabled(p_enabled);
 		setVerticalScrollBarEnabled(p_enabled);
-		getSettings().setBuiltInZoomControls(p_enabled);
-		if (!m_scrolling_enabled)
-		{
-			setOnTouchListener(new View.OnTouchListener() {
-				@Override
-				public boolean onTouch(View v, MotionEvent event) {
-					return (event.getAction() == MotionEvent.ACTION_MOVE);
-				}
-			});
-		}
-		else
-			setOnTouchListener(null);
+	}
+	
+	public boolean getHorizontalScrollbarEnabled()
+	{
+		return isHorizontalScrollBarEnabled();
+	}
+	
+	public void setHorizontalScrollbarEnabled(boolean p_enabled)
+	{
+		setHorizontalScrollBarEnabled(p_enabled);
 	}
 	
 	public String getUserAgent()
diff --git a/libbrowser/include/libbrowser.h b/libbrowser/include/libbrowser.h
@@ -62,7 +62,8 @@ enum MCBrowserProperty
 {
 //	kMCBrowserRect,
 	// Boolean properties
-	kMCBrowserScrollbars,
+	kMCBrowserVerticalScrollbarEnabled,
+	kMCBrowserHorizontalScrollbarEnabled,
 	kMCBrowserAllowNewWindows,
 	kMCBrowserEnableContextMenu,
 	
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -606,8 +606,11 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	{
 		switch (p_property)
 		{
-			case kMCBrowserScrollbars:
-				return GetScrollbarsEnabled(r_value);
+			case kMCBrowserVerticalScrollbarEnabled:
+				return GetVerticalScrollbarEnabled(r_value);
+				
+			case kMCBrowserHorizontalScrollbarEnabled:
+				return GetHorizontalScrollbarEnabled(r_value);
 			
 			default:
 				break;
@@ -620,9 +623,12 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	{
 		switch (p_property)
 		{
-			case kMCBrowserScrollbars:
-				return SetScrollbarsEnabled(p_value);
+			case kMCBrowserVerticalScrollbarEnabled:
+				return SetVerticalScrollbarEnabled(p_value);
 			
+			case kMCBrowserHorizontalScrollbarEnabled:
+				return SetHorizontalScrollbarEnabled(p_value);
+				
 			default:
 				break;
 		}
@@ -729,15 +735,27 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	//////////
 	
 private:
-	bool GetScrollbarsEnabled(bool &r_value)
+	bool GetVerticalScrollbarEnabled(bool &r_value)
+	{
+		MCAndroidObjectRemoteCall(m_view, "getVerticalScrollbarEnabled", "b", &r_value);
+		return true;
+	}
+	
+	bool SetVerticalScrollbarEnabled(bool p_value)
+	{
+		MCAndroidObjectRemoteCall(m_view, "setVerticalScrollbarEnabled", "vb", nil, p_value);
+		return true;
+	}
+	
+	bool GetHorizontalScrollbarEnabled(bool &r_value)
 	{
-		MCAndroidObjectRemoteCall(m_view, "getScrollingEnabled", "b", &r_value);
+		MCAndroidObjectRemoteCall(m_view, "getHorizontalScrollbarEnabled", "b", &r_value);
 		return true;
 	}
 	
-	bool SetScrollbarsEnabled(bool p_value)
+	bool SetHorizontalScrollbarEnabled(bool p_value)
 	{
-		MCAndroidObjectRemoteCall(m_view, "setScrollingEnabled", "vb", nil, p_value);
+		MCAndroidObjectRemoteCall(m_view, "setHorizontalScrollbarEnabled", "vb", nil, p_value);
 		return true;
 	}
 	
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -1284,16 +1284,23 @@ void MCCefBrowserBase::SetSource(const char *p_source)
 	m_browser->GetMainFrame()->LoadString(t_source, t_url);
 }
 
+#define MCCEF_VERTICAL_OVERFLOW_PROPERTY "document.body.style.overflowY"
+#define MCCEF_HORIZONTAL_OVERFLOW_PROPERTY "document.body.style.overflowX"
+inline const char *scrollbar_property(MCCefScrollbarDirection p_direction)
+{
+	return p_direction == kMCCefScrollbarVertical ? MCCEF_VERTICAL_OVERFLOW_PROPERTY : MCCEF_HORIZONTAL_OVERFLOW_PROPERTY;
+}
+
 // IM-2014-08-25: [[ Bug 13272 ]] Implement CEF browser scrollbar property.
-bool MCCefBrowserBase::GetOverflowHidden()
+bool MCCefBrowserBase::GetOverflowHidden(MCCefScrollbarDirection p_direction)
 {
 	// property available through JavaScript
 	bool t_success;
 	t_success = true;
 	
 	CefString t_value;
 	
-	t_success = EvalJavaScript("document.body.style.overflow", t_value);
+	t_success = EvalJavaScript(scrollbar_property(p_direction), t_value);
 	
 	// assume scrollbars are visible if property fetch fails
 	if (!t_success)
@@ -1303,7 +1310,7 @@ bool MCCefBrowserBase::GetOverflowHidden()
 }
 
 // IM-2014-08-25: [[ Bug 13272 ]] Implement CEF browser scrollbar property.
-void MCCefBrowserBase::SetOverflowHidden(bool p_hidden)
+void MCCefBrowserBase::SetOverflowHidden(MCCefScrollbarDirection p_direction, bool p_hidden)
 {
 	// property available through JavaScript
 	
@@ -1313,7 +1320,7 @@ void MCCefBrowserBase::SetOverflowHidden(bool p_hidden)
 	char *t_overflow_script;
 	t_overflow_script = nil;
 	
-	t_success = MCCStringFormat(t_overflow_script, "document.body.style.overflow = \"%s\"", p_hidden ? "hidden" : "");
+	t_success = MCCStringFormat(t_overflow_script, "%s = \"%s\"", scrollbar_property(p_direction), p_hidden ? "hidden" : "");
 	
 	CefString t_return_value;
 	
@@ -1323,16 +1330,28 @@ void MCCefBrowserBase::SetOverflowHidden(bool p_hidden)
 	MCCStringFree(t_overflow_script);
 }
 
-bool MCCefBrowserBase::GetScrollbars(void)
+bool MCCefBrowserBase::GetVerticalScrollbarEnabled(void)
+{
+	// IM-2014-08-25: [[ Bug 13272 ]] Show / hide scrollbars by setting the overflow style to empty / "hidden".
+	return !GetOverflowHidden(kMCCefScrollbarVertical);
+}
+
+void MCCefBrowserBase::SetVerticalScrollbarEnabled(bool p_scrollbars)
 {
 	// IM-2014-08-25: [[ Bug 13272 ]] Show / hide scrollbars by setting the overflow style to empty / "hidden".
-	return !GetOverflowHidden();
+	/* UNCHECKED */ SetOverflowHidden(kMCCefScrollbarVertical, !p_scrollbars);
 }
 
-void MCCefBrowserBase::SetScrollbars(bool p_scrollbars)
+bool MCCefBrowserBase::GetHorizontalScrollbarEnabled(void)
 {
 	// IM-2014-08-25: [[ Bug 13272 ]] Show / hide scrollbars by setting the overflow style to empty / "hidden".
-	/* UNCHECKED */ SetOverflowHidden(!p_scrollbars);
+	return !GetOverflowHidden(kMCCefScrollbarHorizontal);
+}
+
+void MCCefBrowserBase::SetHorizontalScrollbarEnabled(bool p_scrollbars)
+{
+	// IM-2014-08-25: [[ Bug 13272 ]] Show / hide scrollbars by setting the overflow style to empty / "hidden".
+	/* UNCHECKED */ SetOverflowHidden(kMCCefScrollbarHorizontal, !p_scrollbars);
 }
 
 bool MCCefBrowserBase::GetRect(MCBrowserRect &r_rect)
@@ -1551,8 +1570,12 @@ bool MCCefBrowserBase::GetBoolProperty(MCBrowserProperty p_property, bool &r_val
 			r_value = GetEnableContextMenu();
 			return true;
 			
-		case kMCBrowserScrollbars:
-			r_value = GetScrollbars();
+		case kMCBrowserVerticalScrollbarEnabled:
+			r_value = GetVerticalScrollbarEnabled();
+			return true;
+			
+		case kMCBrowserHorizontalScrollbarEnabled:
+			r_value = GetHorizontalScrollbarEnabled();
 			return true;
 			
 		default:
@@ -1574,8 +1597,12 @@ bool MCCefBrowserBase::SetBoolProperty(MCBrowserProperty p_property, bool p_valu
 			SetEnableContextMenu(p_value);
 			return true;
 			
-		case kMCBrowserScrollbars:
-			SetScrollbars(p_value);
+		case kMCBrowserVerticalScrollbarEnabled:
+			SetVerticalScrollbarEnabled(p_value);
+			return true;
+			
+		case kMCBrowserHorizontalScrollbarEnabled:
+			SetHorizontalScrollbarEnabled(p_value);
 			return true;
 			
 		default:
diff --git a/libbrowser/src/libbrowser_cef.h b/libbrowser/src/libbrowser_cef.h
@@ -35,6 +35,12 @@ enum MCCefAuthScheme
 	kMCCefAuthSPDYProxy,
 };
 
+enum MCCefScrollbarDirection
+{
+	kMCCefScrollbarVertical = 1<<0,
+	kMCCefScrollbarHorizontal = 1<<1,
+};
+
 class MCCefBrowserBase : public MCBrowserBase
 {
 public:
@@ -82,8 +88,8 @@ class MCCefBrowserBase : public MCBrowserBase
 	bool WaitOnResultString(CefString &r_result);
 	bool GetMessageResultString(CefProcessId p_target, CefRefPtr<CefProcessMessage> p_message, CefString &r_result);
 	
-	bool GetOverflowHidden();
-	void SetOverflowHidden(bool p_hidden);
+	bool GetOverflowHidden(MCCefScrollbarDirection);
+	void SetOverflowHidden(MCCefScrollbarDirection, bool p_hidden);
 	
 public:
 	bool GetUserAgent(CefString &r_user_agent);
@@ -101,8 +107,11 @@ class MCCefBrowserBase : public MCBrowserBase
 	virtual char *GetSource(void);
 	virtual void SetSource(const char *p_source);
 	
-	virtual bool GetScrollbars(void);
-	virtual void SetScrollbars(bool p_scrollbars);
+	virtual bool GetVerticalScrollbarEnabled(void);
+	virtual void SetVerticalScrollbarEnabled(bool p_scrollbars);
+	
+	virtual bool GetHorizontalScrollbarEnabled(void);
+	virtual void SetHorizontalScrollbarEnabled(bool p_scrollbars);
 	
 	virtual char *GetUserAgent(void);
 	virtual void SetUserAgent(const char *p_user_agent);
diff --git a/libbrowser/src/libbrowser_uiwebview.h b/libbrowser/src/libbrowser_uiwebview.h
@@ -51,8 +51,10 @@ class MCUIWebViewBrowser : public MCBrowserBase
 	bool GetHTMLText(char *&r_htmltext);
 	bool SetHTMLText(const char *p_htmltext);
 	
-	bool GetScrollingEnabled(bool& r_value);
-	bool SetScrollingEnabled(bool p_value);
+	bool GetVerticalScrollbarEnabled(bool& r_value);
+	bool SetVerticalScrollbarEnabled(bool p_value);
+	bool GetHorizontalScrollbarEnabled(bool& r_value);
+	bool SetHorizontalScrollbarEnabled(bool p_value);
 	
 	bool GetJavaScriptHandlers(char *&r_handlers);
 	bool SetJavaScriptHandlers(const char *p_handlers);
diff --git a/libbrowser/src/libbrowser_uiwebview.mm b/libbrowser/src/libbrowser_uiwebview.mm
@@ -247,41 +247,67 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
 	return true;
 }
 
-bool MCUIWebViewBrowser::SetScrollingEnabled(bool p_value)
+bool MCUIWebViewBrowser::GetUrl(char *&r_url)
+{
+	UIWebView *t_view;
+	if (!GetView(t_view))
+		return false;
+	
+	__block bool t_success;
+	MCBrowserRunBlockOnMainFiber(^{
+		t_success = MCCStringClone([[[[t_view request] URL] absoluteString] cStringUsingEncoding: NSUTF8StringEncoding], r_url);
+	});
+	
+	return t_success;
+}
+
+bool MCUIWebViewBrowser::SetVerticalScrollbarEnabled(bool p_value)
 {
 	UIWebView *t_view;
 	if (!GetView(t_view))
 		return false;
 	
 	MCBrowserRunBlockOnMainFiber(^{
-		[GetScrollView() setScrollEnabled: p_value ? YES : NO];
+		GetScrollView().showsVerticalScrollIndicator = p_value ? YES : NO;
 	});
 	
 	return true;
 }
 
-bool MCUIWebViewBrowser::GetUrl(char *&r_url)
+bool MCUIWebViewBrowser::GetVerticalScrollbarEnabled(bool& r_value)
 {
 	UIWebView *t_view;
 	if (!GetView(t_view))
 		return false;
 	
-	__block bool t_success;
 	MCBrowserRunBlockOnMainFiber(^{
-		t_success = MCCStringClone([[[[t_view request] URL] absoluteString] cStringUsingEncoding: NSUTF8StringEncoding], r_url);
+		r_value = GetScrollView().showsVerticalScrollIndicator;
 	});
+	
+	return true;
+}
 
-	return t_success;
+bool MCUIWebViewBrowser::SetHorizontalScrollbarEnabled(bool p_value)
+{
+	UIWebView *t_view;
+	if (!GetView(t_view))
+		return false;
+	
+	MCBrowserRunBlockOnMainFiber(^{
+		GetScrollView().showsHorizontalScrollIndicator = p_value ? YES : NO;
+	});
+	
+	return true;
 }
 
-bool MCUIWebViewBrowser::GetScrollingEnabled(bool& r_value)
+bool MCUIWebViewBrowser::GetHorizontalScrollbarEnabled(bool& r_value)
 {
 	UIWebView *t_view;
 	if (!GetView(t_view))
 		return false;
 	
 	MCBrowserRunBlockOnMainFiber(^{
-		r_value = [GetScrollView() isScrollEnabled];
+		r_value = GetScrollView().showsHorizontalScrollIndicator;
 	});
 	
 	return true;
@@ -385,8 +411,11 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
 {
 	switch (p_property)
 	{
-		case kMCBrowserScrollbars:
-			return SetScrollingEnabled(p_value);
+		case kMCBrowserVerticalScrollbarEnabled:
+			return SetVerticalScrollbarEnabled(p_value);
+			
+		case kMCBrowserHorizontalScrollbarEnabled:
+			return SetHorizontalScrollbarEnabled(p_value);
 			
 		default:
 			break;
@@ -399,8 +428,11 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
 {
 	switch (p_property)
 	{
-		case kMCBrowserScrollbars:
-			return GetScrollingEnabled(r_value);
+		case kMCBrowserVerticalScrollbarEnabled:
+			return GetVerticalScrollbarEnabled(r_value);
+			
+		case kMCBrowserHorizontalScrollbarEnabled:
+			return GetHorizontalScrollbarEnabled(r_value);
 			
 		default:
 			break;

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ enum MCBrowserProperty`
`62`	`62`	`{`
`63`	`63`	`// kMCBrowserRect,`
`64`	`64`	`// Boolean properties`
`65`		`- kMCBrowserScrollbars,`
	`65`	`+ kMCBrowserVerticalScrollbarEnabled,`
	`66`	`+ kMCBrowserHorizontalScrollbarEnabled,`
`66`	`67`	`kMCBrowserAllowNewWindows,`
`67`	`68`	`kMCBrowserEnableContextMenu,`
`68`	`69`