Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 595:fd0b60dee6f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix Selection of primary view: At the begin of the dive and while switching between T7 <=> T3 view a primary view could be shown which was deactivated by the selection dialog. In case the primary view is now deactivated, the next activated view will be shown instead
author Ideenmodellierer
date Mon, 04 Jan 2021 21:32:39 +0100
parents f52bc70e380f
children 49a662df8210
comparison
equal deleted inserted replaced
594:280c11153080 595:fd0b60dee6f3
26 /// along with this program. If not, see <http://www.gnu.org/licenses/>. 26 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
27 ////////////////////////////////////////////////////////////////////////////// 27 //////////////////////////////////////////////////////////////////////////////
28 28
29 /* Includes ------------------------------------------------------------------*/ 29 /* Includes ------------------------------------------------------------------*/
30 #include "t7.h" 30 #include "t7.h"
31 #include "t3.h"
31 #include "settings.h" 32 #include "settings.h"
32 #include "data_exchange_main.h" 33 #include "data_exchange_main.h"
33 #include "decom.h" 34 #include "decom.h"
34 #include "gfx_fonts.h" 35 #include "gfx_fonts.h"
35 #include "logbook_miniLive.h" 36 #include "logbook_miniLive.h"
568 if(last_mode != MODE_DIVE) 569 if(last_mode != MODE_DIVE)
569 { 570 {
570 last_mode = MODE_DIVE; 571 last_mode = MODE_DIVE;
571 /* lower left corner primary */ 572 /* lower left corner primary */
572 selection_custom_field = settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary; 573 selection_custom_field = settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary;
573 /* custom view primary OR debug if automatic return is off */ 574 /* custom view primary OR debug if automatic return is off | T7 is default dive view => also initialize big font view */
574 if((settingsGetPointer()->tX_customViewTimeout == 0) && (settingsGetPointer()->showDebugInfo)) 575 if((settingsGetPointer()->tX_customViewTimeout == 0) && (settingsGetPointer()->showDebugInfo))
575 selection_customview = CVIEW_noneOrDebug; 576 {
577 selection_customview = CVIEW_noneOrDebug;
578 t3_select_customview(CVIEW_noneOrDebug);
579 }
576 else 580 else
581 {
577 selection_customview = settingsGetPointer()->tX_customViewPrimary; 582 selection_customview = settingsGetPointer()->tX_customViewPrimary;
578 583 t3_set_customview_to_primary();
584 }
579 t7_change_customview(ACTION_END); 585 t7_change_customview(ACTION_END);
580 586
581 if((settingsGetPointer()->MotionDetection != MOTION_DETECT_OFF)) 587 if((settingsGetPointer()->MotionDetection != MOTION_DETECT_OFF))
582 { 588 {
583 InitMotionDetection(); 589 InitMotionDetection();