Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(914)

Unified Diff: ui/views/controls/textfield/textfield.h

Issue 290733007: Make Textfield scroll continuously when dragging beyond edges. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary test file changes. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/timer/timer.h ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield.h
diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
index ea0bb767f007095a387b4a509332855acc4e750f..e00d58317b5310fbeecf2df8b5c787a5f5378ef4 100644
--- a/ui/views/controls/textfield/textfield.h
+++ b/ui/views/controls/textfield/textfield.h
@@ -323,6 +323,9 @@ class VIEWS_EXPORT Textfield : public View,
// Helper function to call MoveCursorTo on the TextfieldModel.
void MoveCursorTo(const gfx::Point& point, bool select);
+ // Helper function to update the selection on a mouse drag.
+ void SelectThroughLastDragLocation();
+
// Convenience method to notify the InputMethod and TouchSelectionController.
void OnCaretBoundsChanged();
@@ -378,16 +381,11 @@ class VIEWS_EXPORT Textfield : public View,
scoped_ptr<Painter> focus_painter_;
- // Text color. Only used if |use_default_text_color_| is false.
+ // Flags indicating whether text and background system colors should be used,
+ // and the actual color values used if the corresponding flags are set false.
SkColor text_color_;
-
- // Should we use the system text color instead of |text_color_|?
bool use_default_text_color_;
-
- // Background color. Only used if |use_default_background_color_| is false.
SkColor background_color_;
-
- // Should we use the system background color instead of |background_color_|?
bool use_default_background_color_;
// Text to display when empty.
@@ -406,9 +404,8 @@ class VIEWS_EXPORT Textfield : public View,
base::TimeDelta password_reveal_duration_;
base::OneShotTimer<Textfield> password_reveal_timer_;
- // Keeps track of whether currently performing a user action (i.e. when
- // OnBeforeUserAction() has been called, but OnAfterUserAction() is yet to be
- // called).
+ // Tracks whether a user action is being performed; i.e. OnBeforeUserAction()
+ // has been called, but OnAfterUserAction() has not yet been called.
bool performing_user_action_;
// True if InputMethod::CancelComposition() should not be called.
@@ -425,6 +422,10 @@ class VIEWS_EXPORT Textfield : public View,
// Is the user potentially dragging and dropping from this view?
bool initiating_drag_;
+ // A timer and point used to modify the selection when dragging.
+ base::RepeatingTimer<Textfield> drag_selection_timer_;
+ gfx::Point last_drag_location_;
+
// State variables used to track double and triple clicks.
size_t aggregated_clicks_;
base::TimeDelta last_click_time_;
« no previous file with comments | « base/timer/timer.h ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698