Mercurial > octave
changeset 20697:7f568368d247
maint: periodic merge of stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 12 Nov 2015 15:06:57 -0500 |
| parents | 0dfeb5c82750 (current diff) 950c8a092db7 (diff) |
| children | e15b7963746b |
| files | libgui/src/history-dock-widget.cc libgui/src/history-dock-widget.h libgui/src/m-editor/file-editor.cc scripts/general/quadv.m |
| diffstat | 4 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/history-dock-widget.cc Wed Nov 11 12:22:10 2015 -0500 +++ b/libgui/src/history-dock-widget.cc Thu Nov 12 15:06:57 2015 -0500 @@ -346,3 +346,14 @@ _history_list_view->selectAll (); } } + +void history_dock_widget::handle_visibility (bool visible) +{ + octave_dock_widget::handle_visibility (visible); + + if (visible) + { + int filter_state = _filter_checkbox->isChecked (); + filter_activate (filter_state); + } +} \ No newline at end of file
--- a/libgui/src/history-dock-widget.h Wed Nov 11 12:22:10 2015 -0500 +++ b/libgui/src/history-dock-widget.h Thu Nov 12 15:06:57 2015 -0500 @@ -74,6 +74,8 @@ void pasteClipboard (); void selectAll (); + virtual void handle_visibility (bool visible); + private: void construct ();
--- a/libgui/src/m-editor/file-editor.cc Wed Nov 11 12:22:10 2015 -0500 +++ b/libgui/src/m-editor/file-editor.cc Thu Nov 12 15:06:57 2015 -0500 @@ -1232,9 +1232,6 @@ i.key ()->setTitle (i.value ().at (! enable)); ++i; } - - if (enable) - focus (); } QMenu*
--- a/scripts/general/quadv.m Wed Nov 11 12:22:10 2015 -0500 +++ b/scripts/general/quadv.m Thu Nov 12 15:06:57 2015 -0500 @@ -35,8 +35,8 @@ ## @var{a} and @var{b} are the lower and upper limits of integration. Both ## limits must be finite. ## -## The optional argument @var{tol} defines the tolerance used to stop the -## adaptation procedure. The default value is 1e-6. +## The optional argument @var{tol} defines the absolute tolerance used to stop +## the adaptation procedure. The default value is 1e-6. ## ## The algorithm used by @code{quadv} involves recursively subdividing the ## integration interval and applying Simpson's rule on each subinterval.