mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redefined NORMAL_INPUT_MOVE in src/Fl_Input.cxx to reflect the new option

Browse Source 
Fl::option(Fl::OPTION_ARROW_FOCUS). Maybe this could improved, but this is
the shortest way to make the option work always.

Improved tooltips in test/preferences.fl for users and system managers.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8035 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2010-12-15 13:02:36 +00:00
parent 113c9df703
commit eafeac5f98
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Fl_Input.cxx
View File

@ -62,11 +62,19 @@ int Fl_Input::shift_up_down_position(int p) {
return up_down_position(p, Fl::event_state(FL_SHIFT));
}
// If you define this symbol as zero you will get the peculiar fltk
// Old text from FLTK 1.1 for reference:
// If you define NORMAL_INPUT_MOVE as zero you will get the peculiar fltk
// behavior where moving off the end of an input field will move the
// cursor into the next field:
// define it as 1 to prevent cursor movement from going to next field:
#define NORMAL_INPUT_MOVE 0
//
// Note: this has been replaced by Fl::option(Fl::OPTION_ARROW_FOCUS)
// in FLTK 1.3. This option has "inverted" values:
// 1 = Arrow keys move focus (previously 0)
// 0 = Arrow keys don't move focus (previously 1)
// Hence we define ...
//
#define NORMAL_INPUT_MOVE (Fl::option(Fl::OPTION_ARROW_FOCUS) ? 0 : 1)
#define ctrl(x) ((x)^0x40)

8
test/preferences.fl
View File

@ -104,7 +104,7 @@ opt[Fl::OPTION_VISIBLE_FOCUS][mode] = wVisibleFocus->value();} open
If visible focus is switched on, FLTK will draw a dotted rectangle inside the widget that will receive the next keystroke. If switched off, no such indicator will be drawn and keyboard navigation is disabled.
On by default.} xywh {245 40 100 25} down_box BORDER_BOX
Default is on.} xywh {245 40 100 25} down_box BORDER_BOX
} {
MenuItem {} {
label off
@ -128,7 +128,7 @@ On by default.} xywh {245 40 100 25} down_box BORDER_BOX
opt[Fl::OPTION_ARROW_FOCUS][mode] = wArrowFocus->value();} open
tooltip {OPTION_ARROW_FOCUS
When switched on, moving the text cursor beyond the start or end of a text in a text widget will change focus to the next text widgt. When switched off, the cursor will stop at the end of the text. Pressing Tab or Ctrl-Tab will advance the keyboard focus.
When switched on, moving the text cursor beyond the start or end of the text in a text widget will change focus to the next widget. When switched off, the cursor will stop at the end of the text. Pressing Tab or Ctrl-Tab will advance the keyboard focus. Switch this on, if you want the old behavior of FLTK 1.1.
Default is off.} xywh {245 75 100 25} down_box BORDER_BOX
} {
@ -159,7 +159,7 @@ Default is off.} xywh {245 75 100 25} down_box BORDER_BOX
opt[Fl::OPTION_SHOW_TOOLTIPS][mode] = wShowTooltips->value();} open
tooltip {OPTION_SHOW_TOOLTIPS
If tooltips are enabled, hovering the mouse over a widget with a tooltip text will open a little tootip window until the mouse leaves the widget. If disabled, no tooltip is shown.
If tooltips are enabled, hovering the mouse over a widget with a tooltip text will open a little tooltip window until the mouse leaves the widget. If disabled, no tooltip is shown.
Default is on.} xywh {245 150 100 25} down_box BORDER_BOX
} {
@ -213,7 +213,7 @@ Default is on.} xywh {245 225 100 25} down_box BORDER_BOX
}
Fl_Choice wUserOrSystem {
callback {refreshUI();} open
tooltip {Change settings for the current user, or for all users of this computer.} xywh {14 275 141 25} down_box BORDER_BOX
tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default'). } xywh {14 275 141 25} down_box BORDER_BOX
} {
MenuItem {} {
label {User Settings}