From 0e02e527cf97449315ae718f5b387afbbe2d2a3c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 17 Apr 2015 06:16:57 +0000
Subject: [PATCH] Alt+t without numeric mode; Alt+Shift+t with numeric mode
---
Common/CommandLine.cpp | 2 +-
Fltk/FlGui.cpp | 14 +++++++-------
doc/texinfo/shortcuts.texi | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index e1eff3dfe1..3768e66615 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -235,7 +235,7 @@ std::vector<std::pair<std::string, std::string> > GetShortcutsUsage(const std::s
s.push_back(mp("Alt+Shift+l", "Hide/show mesh lines"));
s.push_back(mp("Alt+Shift+p", "Hide/show mesh points"));
s.push_back(mp("Alt+Shift+s", "Hide/show mesh surface edges"));
- s.push_back(mp("Alt+Shift+t", "Same as Alt+t, but skip numeric mode"));
+ s.push_back(mp("Alt+Shift+t", "Same as Alt+t, but with numeric mode included"));
s.push_back(mp("Alt+Shift+v", "Hide/show mesh volume edges"));
s.push_back(mp("Alt+Shift+w", "Reverse all mesh normals"));
s.push_back(mp("Alt+Shift+x", "Set -X view"));
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index ac5c2fd199..d68a066994 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -771,13 +771,6 @@ int FlGui::testGlobalShortcuts(int event)
status = 2;
}
else if(Fl::test_shortcut(FL_ALT + 't')) {
- for(unsigned int i = 0; i < PView::list.size(); i++)
- if(opt_view_visible(i, GMSH_GET, 0))
- opt_view_intervals_type
- (i, GMSH_SET | GMSH_GUI, opt_view_intervals_type(i, GMSH_GET, 0) + 1);
- status = 2;
- }
- else if(Fl::test_shortcut(FL_ALT + FL_SHIFT + 't')) {
for(unsigned int i = 0; i < PView::list.size(); i++)
if(opt_view_visible(i, GMSH_GET, 0)){
int t = opt_view_intervals_type(i, GMSH_GET, 0) + 1;
@@ -786,6 +779,13 @@ int FlGui::testGlobalShortcuts(int event)
}
status = 2;
}
+ else if(Fl::test_shortcut(FL_ALT + FL_SHIFT + 't')) {
+ for(unsigned int i = 0; i < PView::list.size(); i++)
+ if(opt_view_visible(i, GMSH_GET, 0))
+ opt_view_intervals_type
+ (i, GMSH_SET | GMSH_GUI, opt_view_intervals_type(i, GMSH_GET, 0) + 1);
+ status = 2;
+ }
else if(Fl::test_shortcut(FL_ALT + 'r')) {
for(unsigned int i = 0; i < PView::list.size(); i++)
if(opt_view_visible(i, GMSH_GET, 0))
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index d88f6060a1..8d65486f78 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -141,7 +141,7 @@ Hide/show mesh points
@item Alt+Shift+s
Hide/show mesh surface edges
@item Alt+Shift+t
-Same as Alt+t, but skip numeric mode
+Same as Alt+t, but with numeric mode included
@item Alt+Shift+v
Hide/show mesh volume edges
@item Alt+Shift+w
--
GitLab