From b56c255be236d3a2ab927cd920adecb8b4ac8689 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Mon, 6 May 2024 12:04:26 +0400 Subject: [PATCH] Improve appearance of script editor in the OpenMW-CS --- apps/opencs/view/world/scriptedit.cpp | 4 +++- files/opencs/record-down.svg | 7 +++---- files/opencs/record-next.svg | 6 +++--- files/opencs/record-previous.svg | 6 +++--- files/opencs/record-up.svg | 7 +++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp index c8505f007f..00acf71235 100644 --- a/apps/opencs/view/world/scriptedit.cpp +++ b/apps/opencs/view/world/scriptedit.cpp @@ -2,6 +2,7 @@ #include +#include #include #include #include @@ -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); diff --git a/files/opencs/record-down.svg b/files/opencs/record-down.svg index 9febe57065..1f3d8a385d 100644 --- a/files/opencs/record-down.svg +++ b/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" /> + 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" /> diff --git a/files/opencs/record-next.svg b/files/opencs/record-next.svg index bbc44e7459..d3fb40a720 100644 --- a/files/opencs/record-next.svg +++ b/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" /> + 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" /> diff --git a/files/opencs/record-previous.svg b/files/opencs/record-previous.svg index 2479c8bd49..dd03d27128 100644 --- a/files/opencs/record-previous.svg +++ b/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" /> + 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" /> diff --git a/files/opencs/record-up.svg b/files/opencs/record-up.svg index 351cb14d4a..28331ae42f 100644 --- a/files/opencs/record-up.svg +++ b/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" /> + 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" />