Changeset 128858 in webkit
- Timestamp:
- Sep 18, 2012 1:17:21 AM (12 years ago)
- Location:
- trunk/Source/WebKit/blackberry
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/blackberry/ChangeLog
r128817 r128858 1 2012-09-18 Arvid Nilsson <anilsson@rim.com> 2 3 [BlackBerry] Prevent scroll adjustment of input fields when region of interest mechanism active 4 https://bugs.webkit.org/show_bug.cgi?id=96750 5 6 Reviewed by Antonio Gomes. 7 8 The region of interest mechanism replaces the scrolling/zooming 9 functionality in InputHandler::ensureFocusTextElementVisible(). 10 11 We introduce a new fine-grained setting for the various adjustment 12 modes. The WebKit embedder can disable all scroll types in favor of the 13 region of interest mechanism by using the new setting. 14 15 PR #208387 16 17 Reviewed internally by Mike Fenton. 18 19 * WebKitSupport/AboutData.cpp: 20 (BlackBerry::WebKit::configPage): 21 * WebKitSupport/InputHandler.cpp: 22 (BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible): 23 * WebKitSupport/InputHandler.h: 24 1 25 2012-09-17 Jakob Petsovits <jpetsovits@rim.com> 2 26 -
trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp
r127962 r128858 140 140 page += numberToHTMLTr("fineCursorControlEnabled", settings->fineCursorControlEnabled()); 141 141 page += numberToHTMLTr("alwaysShowKeyboardOnFocus", settings->alwaysShowKeyboardOnFocus()); 142 page += numberToHTMLTr("allow CenterScrollAdjustmentForInputFields", settings->allowCenterScrollAdjustmentForInputFields());142 page += numberToHTMLTr("allowedScrollAdjustmentForInputFields", settings->allowedScrollAdjustmentForInputFields()); 143 143 page += numberToHTMLTr("unrestrictedResizeEvents", settings->unrestrictedResizeEvents()); 144 144 page += numberToHTMLTr("isBridgeBrowser", settings->isBridgeBrowser()); -
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
r128622 r128858 1052 1052 return; 1053 1053 1054 if (! Platform::Settings::instance()->allowCenterScrollAdjustmentForInputFields() && scrollType != EdgeIfNeeded)1054 if (!(Platform::Settings::instance()->allowedScrollAdjustmentForInputFields() & scrollType)) 1055 1055 return; 1056 1056 -
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
r128183 r128858 23 23 24 24 #include <BlackBerryPlatformInputEvents.h> 25 #include <BlackBerryPlatformSettings.h> 25 26 26 27 #include <imf/events.h> … … 66 67 67 68 enum FocusElementType { TextEdit, TextPopup /* Date/Time & Color */, SelectPopup, Plugin }; 68 enum CaretScrollType { CenterAlways, CenterIfNeeded, EdgeIfNeeded }; 69 enum CaretScrollType { CenterAlways = BlackBerry::Platform::Settings::ScrollAdjustmentCenterAlways, 70 CenterIfNeeded = BlackBerry::Platform::Settings::ScrollAdjustmentCenterIfNeeded, 71 EdgeIfNeeded = BlackBerry::Platform::Settings::ScrollAdjustmentEdgeIfNeeded }; 69 72 70 73 bool isInputModeEnabled() const;
Note: See TracChangeset
for help on using the changeset viewer.