Fehler bei Textfeld auswahl behoben

DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 114, 243, 
-    145,  51, 101,  13, 165,  48, 
-     54, 140,  98,   4,  16, 147, 
-    147, 146,   1,   0,   0,   0, 
+     68,  88,  66,  67, 167, 234, 
+    156, 109, 242,  24, 174,  85, 
+    210, 227, 166, 167,  78, 124, 
+    189, 127,   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, 124, 114, 112,  92, 
-      1,   0,   0,   0,  66, 186, 
-     98, 221, 223, 239, 127,  69, 
-    130, 219, 172, 205,  82, 188, 
-    242, 129,   0,   0,   0,   0, 
+     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, 
       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, 
-     37,  42, 101, 234, 250, 202, 
+     31, 165, 235,  21,  36, 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,   8, 124,  85,   3, 
+      0,   0, 216, 123, 113,   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, 
-    124, 114, 112,  92,   1,   0, 
-      0,   0,  66, 186,  98, 221, 
-    223, 239, 127,  69, 130, 219, 
-    172, 205,  82, 188, 242, 129, 
+    142, 183, 112,  92,   1,   0, 
+      0,   0, 144, 137, 180, 194, 
+      4, 234,  39,  69, 188, 155, 
+    115, 128, 237, 169, 132, 204, 
     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, 254, 185, 
-    146,   8, 224, 111, 124,  60, 
-    131,  22, 229, 113, 218, 219, 
-     74,  64,   1,   0,   0,   0, 
+     68,  88,  66,  67, 194, 140, 
+    212, 158, 147, 231,  46, 175, 
+    124, 103,  15,  15,  39, 219, 
+    160, 157,   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, 124, 114, 
+    148,  46,  49,   1, 143, 183, 
     112,  92,   1,   0,   0,   0, 
-    136, 242,  51, 195, 122,  16, 
-    134,  64, 147,  62, 213, 187, 
-    169,  30, 224, 105,   0,   0, 
+    217, 233, 176, 120, 148,  80, 
+     28,  71, 189, 252, 210, 238, 
+     31,  57, 237,  63,   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, 
-     84, 216,   1,   0,  53, 174, 
+    207,  46,   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,  47,  53, 155, 234, 
-    250, 202, 212,   1,   1,   0, 
+      0,   0,  24, 236,  46,  22, 
+     36, 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, 
-     64, 107,   0,   0, 242, 241, 
+    240, 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, 
-    224, 105,   0,   0,   0,   0, 
+      0,   0,   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, 
-    200, 124, 203,   3,   0,   0, 
+      8, 121,  54,   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, 224, 105, 
+      0,  96,   0,   0,   0,   0, 
       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, 124, 114, 
+    148,  46,  49,   1, 143, 183, 
     112,  92,   1,   0,   0,   0, 
-    136, 242,  51, 195, 122,  16, 
-    134,  64, 147,  62, 213, 187, 
-    169,  30, 224, 105, 138,   0, 
+    217, 233, 176, 120, 148,  80, 
+     28,  71, 189, 252, 210, 238, 
+     31,  57, 237,  63, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

TextFeld.cpp

@@ -469,13 +469,17 @@ void TextFeld::replaceAuswahl( const char *text )
     tm->cleanupStyles();
     int sa = tm->textStyle.getEintragAnzahl();
     int last = tm->text->getLength();
+    int si = 0;
     for( int i = sa - 1; i >= 0; i-- )
     {
         TextStyle s = tm->textStyle.get( i );
+        si = i;
         if( s.selected )
         {
             if( ( i > 0 && !tm->textStyle.get( i - 1 ).selected ) || i == 0 )
             {
+                s.selected = false;
+                tm->textStyle.set( s, si );
                 tm->removeText( s.beginIndex, last );
                 tm->insertText( s.beginIndex, text );
             }

UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 156,  39, 
-    179,  28, 243,  60, 165, 197, 
-      9, 185, 122,  87, 132, 231, 
-    210,  22,   1,   0,   0,   0, 
+     68,  88,  66,  67, 178, 152, 
+     97,  88, 239, 158, 254, 163, 
+    169,  80, 190, 175,  36, 145, 
+    211, 160,   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, 
-    124, 114, 112,  92,   1,   0, 
-      0,   0, 196, 224,  21,  32, 
-    204, 222, 135,  75, 151, 218, 
-    220, 142, 185, 188,  15, 165, 
+    143, 183, 112,  92,   1,   0, 
+      0,   0, 127, 152,  69, 225, 
+    137, 255, 128,  65, 146,  38, 
+     15, 185, 123, 182, 207,  61, 
       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, 142, 143, 188, 234, 
-    250, 202, 212,   1,   1,   0, 
+      0,   0,  40, 180,  88,  22, 
+     36, 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, 
-    248, 123,  35,   3,   0,   0, 
+    168, 123, 191,   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, 124, 114, 
+    148,  46,  49,   1, 143, 183, 
     112,  92,   1,   0,   0,   0, 
-    196, 224,  21,  32, 204, 222, 
-    135,  75, 151, 218, 220, 142, 
-    185, 188,  15, 165, 137,   0, 
+    127, 152,  69, 225, 137, 255, 
+    128,  65, 146,  38,  15, 185, 
+    123, 182, 207,  61, 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,  97, 172, 
-     48, 170, 129, 125, 196,  44, 
-      1,  53, 186,  90, 232, 205, 
-    223, 180,   1,   0,   0,   0, 
+     68,  88,  66,  67, 171, 164, 
+     64, 227,  67,  89, 191, 236, 
+    154, 221, 116,  15, 144, 181, 
+     36,  68,   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, 
-    125, 114, 112,  92,   1,   0, 
-      0,   0,  11,  94, 179, 138, 
-     82,   0, 171,  70, 149,  69, 
-    168,   6,  95, 181, 184,  75, 
+    143, 183, 112,  92,   1,   0, 
+      0,   0,  85,  40,  37,  12, 
+    122, 126, 171,  73, 162,  85, 
+     96, 119,  48, 228,  59, 203, 
       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,  18,  41, 248, 234, 
-    250, 202, 212,   1,   1,   0, 
+      0,   0, 237, 171, 165,  22, 
+     36, 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,   0,   0, 
+      0,  96,   0,   0,  59, 203, 
       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,   8, 125, 
-    168,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0, 120, 121, 
+    125,   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, 
-      0,   0,   0,   0,   0,   0, 
+     59, 203,   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, 125, 114, 112,  92, 
-      1,   0,   0,   0,  11,  94, 
-    179, 138,  82,   0, 171,  70, 
-    149,  69, 168,   6,  95, 181, 
-    184,  75, 138,   0,   0,   0, 
+     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, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,