Fehler bei der berechnung der Text Höhe eines Text Feldes behoben

DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 167, 234, 
-    156, 109, 242,  24, 174,  85, 
-    210, 227, 166, 167,  78, 124, 
-    189, 127,   1,   0,   0,   0, 
+     68,  88,  66,  67, 124, 209, 
+     78,  51, 204, 106, 235, 188, 
+    103,  50, 203,  52, 186,  79, 
+    120, 232,   1,   0,   0,   0, 
     184,  91,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      36,   2,   0,   0, 188,   2, 
@@ -763,11 +763,11 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 142, 183, 112,  92, 
-      1,   0,   0,   0, 144, 137, 
-    180, 194,   4, 234,  39,  69, 
-    188, 155, 115, 128, 237, 169, 
-    132, 204,   0,   0,   0,   0, 
+     49,   1,  29,  60, 113,  92, 
+      1,   0,   0,   0, 142,  23, 
+    215,  73,   7,  29, 102,  76, 
+    136,  31, 139, 223, 226, 241, 
+    228, 162,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1788,7 +1788,7 @@ const BYTE DX12PixelShaderBytes[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  27, 226, 
      48,   1, 128,   0,   0,   0, 
-     31, 165, 235,  21,  36, 203, 
+    168, 149,  83,  24, 115, 203, 
     212,   1,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3427,7 +3427,7 @@ const BYTE DX12PixelShaderBytes[] =
       2,   0,   9,   0, 220,   4, 
       0,   0,   0,   0,   0,   0, 
     156,   1,   0,   0,   1,   0, 
-      0,   0, 216, 123, 113,   3, 
+      0,   0, 120, 122,  22,   3, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 109,  97, 105, 110, 
       0, 110, 111, 110, 101,   0, 
@@ -3494,10 +3494,10 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    142, 183, 112,  92,   1,   0, 
-      0,   0, 144, 137, 180, 194, 
-      4, 234,  39,  69, 188, 155, 
-    115, 128, 237, 169, 132, 204, 
+     29,  60, 113,  92,   1,   0, 
+      0,   0, 142,  23, 215,  73, 
+      7,  29, 102,  76, 136,  31, 
+    139, 223, 226, 241, 228, 162, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67, 194, 140, 
-    212, 158, 147, 231,  46, 175, 
-    124, 103,  15,  15,  39, 219, 
-    160, 157,   1,   0,   0,   0, 
+     68,  88,  66,  67, 230, 231, 
+    220, 157, 152, 131, 187,  22, 
+     44, 106, 177,  98,   9, 208, 
+    126, 122,   1,   0,   0,   0, 
     108,  78,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   2,   0,   0,  16,   3, 
@@ -915,11 +915,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 143, 183, 
-    112,  92,   1,   0,   0,   0, 
-    217, 233, 176, 120, 148,  80, 
-     28,  71, 189, 252, 210, 238, 
-     31,  57, 237,  63,   0,   0, 
+    148,  46,  49,   1,  29,  60, 
+    113,  92,   1,   0,   0,   0, 
+    229, 240, 141,   4, 127,  20, 
+    142,  64, 157,   3, 139,  11, 
+    230, 247, 129, 193,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1095,7 +1095,7 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0, 103, 159,   1,   0, 
     179, 120,   1,   0, 238,  97, 
       2,   0,  90,  28,   0,   0, 
-    207,  46,   3,   0,  53, 174, 
+     25,  97,   1,   0,  53, 174, 
       3,   0, 206,  21,   0,   0, 
     193, 205,   3,   0, 207, 193, 
       1,   0,  62,   3,   3,   0, 
@@ -1684,8 +1684,8 @@ const BYTE DX12VertexShaderBytes[] =
     111, 110,  59,  13,  10, 125, 
      59,  13,  10,  13,  10,  47, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  24, 236,  46,  22, 
-     36, 203, 212,   1,   1,   0, 
+      0,   0,  94,  61, 143,  24, 
+    115, 203, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2200,7 +2200,7 @@ const BYTE DX12VertexShaderBytes[] =
      12,  16,   0,   0,   1,   0, 
       1,   0,  14,   0,  23,  21, 
      13,  16,   0,   0,  36,   2, 
-    240, 121,   0,   0, 242, 241, 
+     96, 123,   0,   0, 242, 241, 
      10,   0,  24,  21,  14,  16, 
       0,   0,   1,   0,   0,   2, 
      18,   0,  22,  21,  10,  16, 
@@ -3153,7 +3153,7 @@ const BYTE DX12VertexShaderBytes[] =
       9,   0, 132,   5,   0,   0, 
       0,   0,   0,   0, 236,   2, 
       0,   0,   1,   0,   0,   0, 
-      8, 121,  54,   3,   0,   0, 
+    200, 120, 223,   2,   0,   0, 
       0,   0,   0,   0,   0,   0, 
     109,  97, 105, 110,   0, 110, 
     111, 110, 101,   0,   0,   0, 
@@ -3219,11 +3219,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 143, 183, 
-    112,  92,   1,   0,   0,   0, 
-    217, 233, 176, 120, 148,  80, 
-     28,  71, 189, 252, 210, 238, 
-     31,  57, 237,  63, 138,   0, 
+    148,  46,  49,   1,  29,  60, 
+    113,  92,   1,   0,   0,   0, 
+    229, 240, 141,   4, 127,  20, 
+    142,  64, 157,   3, 139,  11, 
+    230, 247, 129, 193, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

TextFeld.cpp

@@ -274,11 +274,13 @@ int TextFeld::getTextHeight() const
     int len = tm->text->getLength();
     char *text = tm->text->getText();
     int max = 0;
+    int abstand = 0;
     for( int i = 0; i < len; i++ )
     {
         if( text[ i ] == '\n' )
         {
-            th += max;
+            th += max + abstand;
+            abstand = 0;
             max = 0;
             tm->nextStyle();
             continue;
@@ -286,8 +288,10 @@ int TextFeld::getTextHeight() const
         TextRenderer *r = tm->zCurrentRenderer();
         if( r )
         {
-            int tmp = r->getZeilenabstand() + r->getZeilenHeight();
+            int tmp = r->getZeilenHeight();
             max = max >= tmp ? max : tmp;
+            if( max == tmp )
+                abstand = r->getZeichenAbstand();
         }
         tm->nextStyle();
     }

UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 178, 152, 
-     97,  88, 239, 158, 254, 163, 
-    169,  80, 190, 175,  36, 145, 
-    211, 160,   1,   0,   0,   0, 
+     68,  88,  66,  67, 202, 193, 
+    140, 105,  56, 129, 188, 252, 
+    196,  81, 116, 171,  11,   0, 
+    215, 254,   1,   0,   0,   0, 
     136, 104,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   5,   0,   0,  12,   6, 
@@ -1480,10 +1480,10 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    143, 183, 112,  92,   1,   0, 
-      0,   0, 127, 152,  69, 225, 
-    137, 255, 128,  65, 146,  38, 
-     15, 185, 123, 182, 207,  61, 
+     29,  60, 113,  92,   1,   0, 
+      0,   0, 156, 211,  98, 232, 
+      4, 189, 167,  66, 164, 210, 
+      2, 177,  21, 174, 202,  50, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -2419,8 +2419,8 @@ const BYTE UIPixelShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  40, 180,  88,  22, 
-     36, 203, 212,   1,   1,   0, 
+      0,   0, 252,  33, 181,  24, 
+    115, 203, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4400,7 +4400,7 @@ const BYTE UIPixelShader[] =
       9,   0, 160,   7,   0,   0, 
       0,   0,   0,   0, 244,   9, 
       0,   0,   1,   0,   0,   0, 
-    168, 123, 191,   2,   0,   0, 
+    104, 120, 244,   2,   0,   0, 
       0,   0,   0,   0,   0,   0, 
      84, 101, 120, 116, 117, 114, 
     101,  80, 105, 120, 101, 108, 
@@ -4466,11 +4466,11 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 143, 183, 
-    112,  92,   1,   0,   0,   0, 
-    127, 152,  69, 225, 137, 255, 
-    128,  65, 146,  38,  15, 185, 
-    123, 182, 207,  61, 137,   0, 
+    148,  46,  49,   1,  29,  60, 
+    113,  92,   1,   0,   0,   0, 
+    156, 211,  98, 232,   4, 189, 
+    167,  66, 164, 210,   2, 177, 
+     21, 174, 202,  50, 137,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

UIVertexShader.h

@@ -119,10 +119,10 @@ ret
 
 const BYTE UIVertexShader[] =
 {
-     68,  88,  66,  67, 171, 164, 
-     64, 227,  67,  89, 191, 236, 
-    154, 221, 116,  15, 144, 181, 
-     36,  68,   1,   0,   0,   0, 
+     68,  88,  66,  67, 184, 138, 
+     54,  11, 118,  95, 192, 105, 
+    150,  89,   0, 181,  93,  14, 
+    245,  23,   1,   0,   0,   0, 
     168,  77,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      20,   2,   0,   0, 168,   2, 
@@ -873,10 +873,10 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    143, 183, 112,  92,   1,   0, 
-      0,   0,  85,  40,  37,  12, 
-    122, 126, 171,  73, 162,  85, 
-     96, 119,  48, 228,  59, 203, 
+     30,  60, 113,  92,   1,   0, 
+      0,   0, 132,  42,  75, 233, 
+    251,  40,  83,  65, 166,  74, 
+      1, 104,  87, 144, 223, 192, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -1556,8 +1556,8 @@ const BYTE UIVertexShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0, 237, 171, 165,  22, 
-     36, 203, 212,   1,   1,   0, 
+      0,   0,  85, 117, 242,  24, 
+    115, 203, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2934,13 +2934,13 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
     196,   3,   0,   0,  32,   0, 
-      0,  96,   0,   0,  59, 203, 
+      0,  96,   0,   0, 223, 192, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   9,   0, 
      80,   5,   0,   0,   0,   0, 
       0,   0, 236,   2,   0,   0, 
-      1,   0,   0,   0, 120, 121, 
-    125,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0,  40, 123, 
+    198,   3,   0,   0,   0,   0, 
       0,   0,   0,   0,  84, 101, 
     120, 116, 117, 114, 101,  86, 
     101, 114, 116, 101, 120,  83, 
@@ -2950,7 +2950,7 @@ const BYTE UIVertexShader[] =
       1,   0,   0,   0,   0,   0, 
       0,   0, 196,   3,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-     59, 203,   0,   0,   0,   0, 
+    223, 192,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       2,   0,   7,   0,   0,   0, 
       0,   0,   1,   0, 255, 255, 
@@ -3006,11 +3006,11 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 143, 183, 112,  92, 
-      1,   0,   0,   0,  85,  40, 
-     37,  12, 122, 126, 171,  73, 
-    162,  85,  96, 119,  48, 228, 
-     59, 203, 138,   0,   0,   0, 
+     49,   1,  30,  60, 113,  92, 
+      1,   0,   0,   0, 132,  42, 
+     75, 233, 251,  40,  83,  65, 
+    166,  74,   1, 104,  87, 144, 
+    223, 192, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,