Mercurial > octave

comparison libgui/graphics/QtHandlesUtils.cc @ 28300:0c6dcf803529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove support for Qt4 in Octave 7. * configure.ac: Change QT_VERSIONS variable to just "5". * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL, OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT, OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE, OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE, OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE, OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER, OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT, OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS, OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS, OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE, OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA, OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT, OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS, OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE, OCTAVE_HAVE_QGUIAPPLICATION): Remove obsolete macros * m4/acinclude.m4 (HAVE_QT_SCINTILLA): Remove option '4' in case statement for Qt version. * m4/acinclude.m4 (OCTAVE_HAVE_QT): Remove test for Qt4 and AC_DEFINE for HAVE_QT. * m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Remove option '4' in case statement for $qt_version. Remove test for $qt_version = 4 calling pkg_config. Delete calls to macros that were removed. * Canvas.cc (select_object): Remove HAVE_QMOUSEEVENT_LOCALPOS conditionals. * QtHandlesUtils.cc (makeScrollEventStruct): Remove HAVE_QWHEELEVENT_ANGLEDELTA conditional. * Table.cc (updateEnable, updateRearrangeableColumns): Remove HAVE_QT4 conditional. * files-dock-widget.cc (files_dock_widget): Remove HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditional. * find-files-dialog.cc (find_files_dialog): Remove HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditional. * file-editor.cc (file_editor_tab_widget): Remove HAVE_QTABWIDGET_SETMOVABLE conditional. * find-dialog.cc (init_search_text): Remove HAVE_QCOMBOBOX_SETCURRENTTEXT conditional. * main-window.cc (display_community_news): Remove QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS conditional. * octave-qobject.cc (message_handler): Remove QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT conditional. * octave-qobject.cc (base_qobject): Remove HAVE_QINSTALLMESSAGEHANDLER, HAVE_QT4 conditionals. * resource-manager.cc (get_default_font_family): Remove HAVE_QFONT_MONOSPACE conditional. * shortcut-manager.cc (enter_shortcut::keyPressEvent): Remove HAVE_QGUIAPPLICATION conditional. * shortcut-manager.cc (shortcut_manager::fill_treewidget): Remove HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE conditional. * tab-bar.cc (move_tab_left, move_tab_right, switch_tab): Remove HAVE_QTABWIDGET_SETMOVABLE conditional. * variable-editor.cc (variable_dock_widget, change_floating, change_fullscreen): Remove HAVE_QGUIAPPLICATION conditional. * variable-editor.cc (variable_editor_view, setModel): Remove HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE conditional. * variable-editor.cc (construct_tool_bar): Remove QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS conditional. * variable-editor.h (class variable_dock_widget): Remove HAVE_QGUIAPPLICATION conditional. * workspace-view.cc (workspace_view): Remove HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditionals.
author Rik <rik@octave.org>
date Sat, 16 May 2020 13:32:24 -0700
parents f3f29e1801fc
children 7854d5752dd2
comparison
equal deleted inserted replaced
28299:a8f6a7083428 28300:0c6dcf803529
400 { 400 {
401 octave_scalar_map retval; 401 octave_scalar_map retval;
402 402
403 // We assume a standard mouse with 15 degree steps and Qt returns 403 // We assume a standard mouse with 15 degree steps and Qt returns
404 // 1/8 of a degree. 404 // 1/8 of a degree.
405 #if defined (HAVE_QWHEELEVENT_ANGLEDELTA)
406 int ydelta = -(event->angleDelta().y ()); 405 int ydelta = -(event->angleDelta().y ());
407 #else
408 int ydelta = (event->orientation () == Qt::Vertical
409 ? -(event->delta ()) : 0);
410 #endif
411 retval.setfield ("VerticalScrollCount", octave_value (ydelta / 120)); 406 retval.setfield ("VerticalScrollCount", octave_value (ydelta / 120));
412 407
413 // FIXME: Is there any way to access the number of lines a scroll step 408 // FIXME: Is there any way to access the number of lines a scroll step
414 // should correspond to? 409 // should correspond to?
415 retval.setfield ("VerticalScrollAmount", octave_value (3)); 410 retval.setfield ("VerticalScrollAmount", octave_value (3));