Fehler behoben

DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67,   0, 190, 
-     20, 178,  20, 101, 246,  76, 
-    181, 208, 197, 227, 230,  26, 
-     53,  84,   1,   0,   0,   0, 
+     68,  88,  66,  67, 179, 146, 
+    190, 248, 156,  97, 187, 118, 
+    161,  62,  99, 153,  99,   6, 
+     32, 180,   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, 179,  26, 160,  92, 
-      1,   0,   0,   0, 179,  85, 
-     65,  97, 151, 169,  38,  72, 
-    156,  48,  36, 122,  98, 105, 
-     25,  15,   0,   0,   0,   0, 
+     49,   1, 203, 248, 160,  92, 
+      1,   0,   0,   0, 208,   4, 
+     70,  79,   5,  68, 204,  69, 
+    178,  39, 145, 192, 108,  98, 
+     99, 128,   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, 
-    133,  46, 163, 207,  98, 231, 
+     94, 248,  14,  48, 231, 231, 
     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, 184, 123,  11,   3, 
+      0,   0, 216, 122, 178,   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, 
-    179,  26, 160,  92,   1,   0, 
-      0,   0, 179,  85,  65,  97, 
-    151, 169,  38,  72, 156,  48, 
-     36, 122,  98, 105,  25,  15, 
+    203, 248, 160,  92,   1,   0, 
+      0,   0, 208,   4,  70,  79, 
+      5,  68, 204,  69, 178,  39, 
+    145, 192, 108,  98,  99, 128, 
     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,  25,  19, 
-    204, 156,  49, 236, 254, 236, 
-     58, 138, 118,  56,  70,  80, 
-    138, 120,   1,   0,   0,   0, 
+     68,  88,  66,  67, 232,   7, 
+     22, 202, 117, 183,  24, 184, 
+     68, 161, 218,  22, 239,  28, 
+     15, 131,   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, 180,  26, 
+    148,  46,  49,   1, 203, 248, 
     160,  92,   1,   0,   0,   0, 
-    214, 125, 219,  34, 129, 200, 
-     84,  76, 138,  64,  71, 207, 
-    135, 194,  59, 243,   0,   0, 
+     70,  58, 218, 230,   8, 138, 
+    103,  72, 191, 139,  97, 212, 
+    149, 175, 165, 161,   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, 
-    226, 126,   1,   0,  53, 174, 
+    149,  49,   3,   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,  83, 208, 235, 207, 
-     98, 231, 212,   1,   1,   0, 
+      0,   0,  42, 244,  73,  48, 
+    231, 231, 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, 
-     64, 122,   0,   0, 242, 241, 
+    176, 121,   0,   0, 242, 241, 
      10,   0,  24,  21,  14,  16, 
       0,   0,   1,   0,   0,   2, 
      18,   0,  22,  21,  10,  16, 
@@ -3148,19 +3148,19 @@ const BYTE DX12VertexShaderBytes[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,  24,   4,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-     59, 243,   0,   0,   0,   0, 
+    165, 161,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       9,   0, 132,   5,   0,   0, 
       0,   0,   0,   0, 236,   2, 
       0,   0,   1,   0,   0,   0, 
-     56, 123,  45,   3,   0,   0, 
+    136, 121,   4,   3,   0,   0, 
       0,   0,   0,   0,   0,   0, 
     109,  97, 105, 110,   0, 110, 
     111, 110, 101,   0,   0,   0, 
      45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
      24,   4,   0,   0,  32,   0, 
-      0,  96,   0,   0,  59, 243, 
+      0,  96,   0,   0, 165, 161, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   2,   0, 
       7,   0,   0,   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, 180,  26, 
+    148,  46,  49,   1, 203, 248, 
     160,  92,   1,   0,   0,   0, 
-    214, 125, 219,  34, 129, 200, 
-     84,  76, 138,  64,  71, 207, 
-    135, 194,  59, 243, 138,   0, 
+     70,  58, 218, 230,   8, 138, 
+    103,  72, 191, 139,  97, 212, 
+    149, 175, 165, 161, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

TextFeld.cpp

@@ -206,9 +206,9 @@ bool TextFeld::TextStyleManager::nextStyle()
 //  gibt 0 zurück falls es das zeichen nicht gibt
 bool TextFeld::TextStyleManager::stepTo( int index )
 {
-    this->index = index;
-    current = getTextStyle( index );
-    return text && index < text->getLength();
+    resetIteration();
+    while( this->index < index && nextStyle() );
+    return text && this->index == index;
 }
 
 // ändert den inhalt des style objektes auf den style des ersten zeichens

TextFeld.h

@@ -96,7 +96,7 @@ namespace Framework
             
             const static __int64 Center = HCenter | VCenter; // Vereint die Flags HCenter und VCenter
             const static __int64 TextFeld = Sichtbar | Erlaubt | Rahmen | Buffered | VCenter | Editierbar; // Vereint die Flags Sichtbar, Erlaubt, Rahmen, Buffered, VCenter
-            const static __int64 Text = Sichtbar | Mehrzeilig; // Vereint die Flags Sichtbar, Mehrfarbig, Mehrzeilig
+            const static __int64 Text = Sichtbar | Mehrzeilig | Erlaubt; // Vereint die Flags Sichtbar, Mehrfarbig, Mehrzeilig
             const static __int64 TextGebiet = Sichtbar | Erlaubt | Rahmen | Hintergrund | Editierbar | Mehrzeilig | VScroll; // Vereint die Flags Sichtbar, Erlaubt, Rahmen, Hintergrund, Mehrzeilig, Mehrfarbig, VScroll
             const static __int64 Scroll = VScroll | HScroll; // Vereint die Flags VScroll und HScroll
         };

UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67,  97,  79, 
-      9, 169, 128,  51,  10,  21, 
-     65, 227,   7, 248, 136,  33, 
-    181, 125,   1,   0,   0,   0, 
+     68,  88,  66,  67, 169,  77, 
+    215, 185, 182, 146,  39, 175, 
+    241,  51, 201, 132, 251, 218, 
+    254, 176,   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, 
-    180,  26, 160,  92,   1,   0, 
-      0,   0,  76,  55, 222, 115, 
-    190, 197, 154,  72, 180,  65, 
-    237, 126,  53,  57, 184, 177, 
+    203, 248, 160,  92,   1,   0, 
+      0,   0, 152, 102,  58,  80, 
+    169, 211,  72,  78, 132,  81, 
+     98, 217,  57, 172,  19, 197, 
       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, 233, 181,  29, 208, 
-     98, 231, 212,   1,   1,   0, 
+      0,   0, 166,  99, 114,  48, 
+    231, 231, 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, 
-    152, 121,  69,   3,   0,   0, 
+    168, 123,  90,   3,   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, 180,  26, 
+    148,  46,  49,   1, 203, 248, 
     160,  92,   1,   0,   0,   0, 
-     76,  55, 222, 115, 190, 197, 
-    154,  72, 180,  65, 237, 126, 
-     53,  57, 184, 177, 137,   0, 
+    152, 102,  58,  80, 169, 211, 
+     72,  78, 132,  81,  98, 217, 
+     57, 172,  19, 197, 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,  64,  70, 
-     45, 226,  75,  78, 209, 214, 
-     48,  95,  36,  31, 168, 135, 
-    166, 170,   1,   0,   0,   0, 
+     68,  88,  66,  67, 116, 180, 
+     11,  28, 141, 108,  19,  78, 
+    254, 182, 186,  81,  78, 139, 
+    207, 114,   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, 
-    181,  26, 160,  92,   1,   0, 
-      0,   0, 196,  86, 111,  28, 
-    113, 127, 218,  67, 132, 196, 
-     90,  30, 248, 175, 170, 230, 
+    204, 248, 160,  92,   1,   0, 
+      0,   0, 164,  69,  80, 113, 
+    246,  63,  16,  74, 189,   0, 
+     98, 119,  47, 235, 107,   8, 
       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, 159, 135, 107, 208, 
-     98, 231, 212,   1,   1,   0, 
+      0,   0, 135, 159, 171,  48, 
+    231, 231, 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, 170, 230, 
+      0,  96,   0,   0, 107,   8, 
       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, 248, 120, 
-    125,   2,   0,   0,   0,   0, 
+      1,   0,   0,   0,  88, 122, 
+     63,   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, 
-    170, 230,   0,   0,   0,   0, 
+    107,   8,   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, 181,  26, 160,  92, 
-      1,   0,   0,   0, 196,  86, 
-    111,  28, 113, 127, 218,  67, 
-    132, 196,  90,  30, 248, 175, 
-    170, 230, 138,   0,   0,   0, 
+     49,   1, 204, 248, 160,  92, 
+      1,   0,   0,   0, 164,  69, 
+     80, 113, 246,  63,  16,  74, 
+    189,   0,  98, 119,  47, 235, 
+    107,   8, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,