Merge branch 'scriptedit' into 'master'

Improve appearance of script editor in the OpenMW-CS

See merge request OpenMW/openmw!4076

apps/opencs/view/world/scriptedit.cpp

@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include <QApplication>
 #include <QDragEnterEvent>
 #include <QMenu>
 #include <QPainter>
@@ -424,6 +425,7 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent* event)
     painter.setBackgroundMode(Qt::OpaqueMode);
     QFont font = painter.font();
     QBrush background = painter.background();
+    QColor textColor = QApplication::palette().text().color();
 
     while (block.isValid() && top <= event->rect().bottom())
     {
@@ -440,7 +442,7 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent* event)
             else
             {
                 painter.setBackground(background);
-                painter.setPen(Qt::black);
+                painter.setPen(textColor);
             }
             painter.setFont(newFont);
             painter.drawText(0, top, mLineNumberArea->width(), fontMetrics().height(), Qt::AlignRight, number);

files/opencs/record-down.svg

@@ -117,7 +117,7 @@
        xlink:href="#Main-3"
        id="linearGradient6786"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       gradientTransform="matrix(0.95388135,0,0,1.0509393,2.6074109,-0.47696551)"
        x1="2.116667"
        y1="-3.7041662"
        x2="6.3499999"
@@ -137,8 +137,7 @@
        rx="2.8318619e-14" />
     <path
        id="path6782"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6786);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
-       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6786);fill-opacity:1;stroke:none;stroke-width:0.26491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120283,8.2042949 c -0.03261,-0.010163 -0.0557,0.014998 -0.0557,0.068972 v 2.4835411 c 0,0.09214 0.05209,0.118729 0.116333,0.05973 l 1.433536,-1.1996808 c 0.05017,-0.04607 0.05017,-0.1211999 0,-0.1672709 L 51.155284,8.2265564 c -0.01254,-0.011517 -0.02412,-0.01888 -0.035,-0.022267 z m 0.197668,0.5327694 0.992382,0.7967099 -0.992382,0.7939938 z" />
   </g>
 </svg>

files/opencs/record-next.svg

@@ -117,7 +117,7 @@
        xlink:href="#Main-3"
        id="linearGradient6770"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.39687235)"
+       gradientTransform="matrix(0.95393695,0,0,1.0509392,2.7307818,-0.47696343)"
        x1="2.116667"
        y1="-3.7041662"
        x2="6.3499999"
@@ -137,7 +137,7 @@
        rx="2.8318619e-14" />
     <path
        id="path6766"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6770);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="m 51.255265,8.2604776 c -0.03419,-0.00967 -0.05839,0.014271 -0.05839,0.065629 V 10.68927 c 0,0.08767 0.05461,0.112974 0.121957,0.05684 l 1.370457,-1.1415325 c 0.0526,-0.043838 0.0526,-0.1153253 0,-0.1591633 L 51.291958,8.2816649 c -0.01315,-0.010959 -0.02529,-0.017965 -0.03669,-0.021188 z m 0.207225,0.5069458 0.907954,0.7580932 -0.907954,0.7555094 z" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6770);fill-opacity:1;stroke:none;stroke-width:0.264917px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120363,8.204296 c -0.03261,-0.010162 -0.05578,0.014998 -0.05578,0.068972 v 2.483541 c 0,0.09214 0.05211,0.118729 0.116355,0.05973 L 52.61445,9.6168633 c 0.05018,-0.046071 0.05018,-0.1211999 0,-0.167271 L 51.15519,8.2265626 c -0.01254,-0.011517 -0.02395,-0.01888 -0.03483,-0.022267 z m 0.197626,0.5327692 0.992304,0.7967099 -0.983218,0.7939939 z" />
   </g>
 </svg>

files/opencs/record-previous.svg

@@ -117,7 +117,7 @@
        xlink:href="#Main-3"
        id="linearGradient6778"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.39694445)"
+       gradientTransform="matrix(0.95389396,0,0,1.0509392,2.7330252,-0.47696299)"
        x1="2.116667"
        y1="-3.7041662"
        x2="6.3499999"
@@ -137,7 +137,7 @@
        rx="2.8318619e-14" />
     <path
        id="path6774"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6778);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="m 51.255337,8.2604776 c -0.03419,-0.00967 -0.05839,0.014271 -0.05839,0.065629 V 10.68927 c 0,0.08767 0.05461,0.112974 0.121957,0.05684 l 1.370457,-1.1415325 c 0.0526,-0.043838 0.0526,-0.1153253 0,-0.1591633 L 51.29203,8.2816649 c -0.01315,-0.010959 -0.02529,-0.017965 -0.03669,-0.021188 z m 0.207225,0.5069458 0.907954,0.7580932 -0.907954,0.7555094 z" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6778);fill-opacity:1;stroke:none;stroke-width:0.264912px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120353,8.2042965 c -0.03261,-0.010163 -0.05577,0.014998 -0.05577,0.068972 V 10.75681 c 0,0.09214 0.05211,0.118729 0.116349,0.05973 l 1.43352,-1.1996813 c 0.05017,-0.046071 0.05017,-0.1211999 0,-0.167271 L 51.155435,8.2265631 c -0.01254,-0.011517 -0.02421,-0.01888 -0.03509,-0.022267 z M 51.31696,8.7370657 52.310301,9.5337756 51.31696,10.32777 Z" />
   </g>
 </svg>

files/opencs/record-up.svg

@@ -117,7 +117,7 @@
        xlink:href="#Main-3"
        id="linearGradient6788"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       gradientTransform="matrix(0.95388135,0,0,1.0509393,2.6074049,-0.4769654)"
        x1="2.116667"
        y1="-3.7041662"
        x2="6.3499999"
@@ -137,8 +137,7 @@
        rx="2.8318619e-14" />
     <path
        id="path6695"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6788);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
-       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6788);fill-opacity:1;stroke:none;stroke-width:0.26491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120277,8.2042951 c -0.03261,-0.010162 -0.0557,0.014998 -0.0557,0.068972 v 2.4835409 c 0,0.09214 0.05209,0.118729 0.116333,0.05974 l 1.433536,-1.1996855 c 0.05018,-0.04607 0.05018,-0.1211998 0,-0.167271 L 51.155278,8.2265617 c -0.01254,-0.011517 -0.02412,-0.01888 -0.035,-0.022267 z m 0.197668,0.5327694 0.992382,0.7967099 -0.992382,0.7939946 z" />
   </g>
 </svg>