Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 825:4bd8935f5176

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix Flipscreen visualization: In Timer and CCR overview the free custom fram coordinates were not initialized. Depending on which view was activ before the coordinates of the former view were used and sometimes resulting in a bad visualization. To fix the problem the coordinates are now initialized by the views. The top menu bar text in the flip view did not consider spacings in the text position calculation causing an offset between color bar and text. The offset has been corrected.
author Ideenmodellierer
date Mon, 09 Oct 2023 16:50:11 +0200
parents 24b39a432bc2
children 18946846b95b
comparison
equal deleted inserted replaced
822:dff26bf4b542 825:4bd8935f5176
1958 1958
1959 t7cY0free.WindowLineSpacing = 48; 1959 t7cY0free.WindowLineSpacing = 48;
1960 t7cY0free.WindowNumberOfTextLines = 6; 1960 t7cY0free.WindowNumberOfTextLines = 6;
1961 t7cY0free.WindowTab = 375; 1961 t7cY0free.WindowTab = 375;
1962 1962
1963 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
1964 if (!settings->FlipDisplay) { 1963 if (!settings->FlipDisplay) {
1964 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
1965 t7cY0free.WindowX0 += 10; 1965 t7cY0free.WindowX0 += 10;
1966 t7cY0free.WindowY0 += 10; 1966 t7cY0free.WindowY0 += 10;
1967 t7cY0free.WindowY1 = 355; 1967 t7cY0free.WindowY1 = 355;
1968 GFX_write_string(&FontT24, &t7cY0free, heading, 1); 1968 GFX_write_string(&FontT24, &t7cY0free, heading, 1);
1969 t7cY0free.WindowX0 -= 10; 1969 t7cY0free.WindowX0 -= 10;
1970 t7cY0free.WindowY0 -= 10; 1970 t7cY0free.WindowY0 -= 10;
1971 } else { 1971 } else {
1972 t7cY0free.WindowY1 = 400;
1972 t7cY0free.WindowY1 -= 10; 1973 t7cY0free.WindowY1 -= 10;
1973 t7cY0free.WindowX1 -= 10; 1974 t7cY0free.WindowX1 -= 10;
1974 GFX_write_string(&FontT24, &t7cY0free, heading, 1); 1975 GFX_write_string(&FontT24, &t7cY0free, heading, 1);
1975 t7cY0free.WindowY1 += 10; 1976 t7cY0free.WindowY1 += 10;
1976 t7cY0free.WindowX1 += 10; 1977 t7cY0free.WindowX1 += 10;
2111 2112
2112 t7cY0free.WindowLineSpacing = 48; 2113 t7cY0free.WindowLineSpacing = 48;
2113 t7cY0free.WindowNumberOfTextLines = 6; 2114 t7cY0free.WindowNumberOfTextLines = 6;
2114 t7cY0free.WindowTab = 375; 2115 t7cY0free.WindowTab = 375;
2115 2116
2116 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
2117 if (!settings->FlipDisplay) { 2117 if (!settings->FlipDisplay) {
2118 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
2118 t7cY0free.WindowX0 += 10; 2119 t7cY0free.WindowX0 += 10;
2119 t7cY0free.WindowY0 += 10; 2120 t7cY0free.WindowY0 += 10;
2120 t7cY0free.WindowY1 = 355; 2121 t7cY0free.WindowY1 = 355;
2121 GFX_write_string(&FontT24, &t7cY0free, heading, 1); 2122 GFX_write_string(&FontT24, &t7cY0free, heading, 1);
2122 t7cY0free.WindowX0 -= 10; 2123 t7cY0free.WindowX0 -= 10;
2123 t7cY0free.WindowY0 -= 10; 2124 t7cY0free.WindowY0 -= 10;
2124 } else { 2125 } else {
2126 t7cY0free.WindowY1 = 400;
2125 t7cY0free.WindowY1 -= 10; 2127 t7cY0free.WindowY1 -= 10;
2126 t7cY0free.WindowX1 -= 10; 2128 t7cY0free.WindowX1 -= 10;
2127 GFX_write_string(&FontT24, &t7cY0free, heading, 1); 2129 GFX_write_string(&FontT24, &t7cY0free, heading, 1);
2128 t7cY0free.WindowY1 += 10; 2130 t7cY0free.WindowY1 += 10;
2129 t7cY0free.WindowX1 += 10; 2131 t7cY0free.WindowX1 += 10;