pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile on all platforms

Browse Source
This commit is contained in:
Oleg Korshul
2021-03-18 09:17:19 +03:00
parent b725ab4d75
commit b8d663139b
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Test/Applications/gradient/Gradient/mainwindow.cpp
View File

@ -164,7 +164,7 @@ void MainWindow::on_PathType_itemClicked(QListWidgetItem *item)
points = {{5, 10}, {40, 100}, {100, 1}};
info.gradient_type = c_BrushTypeMyTestGradient;
info.ginfo.shading.triangle = {{5 * 3.84, 10 * 3.84}, {40 * 3.84, 100 * 3.84}, {100 * 3.84, 1 * 3.84}};
info.ginfo.shading.triangle_parametrs = {0, 0.1, 1};
info.ginfo.shading.triangle_parametrs = {0.0f, 0.1f, 1.0f};
info.ginfo.shading.parametrised_triangle_shading = false;
info.ginfo.shading.triangle_colors = {{255,0,0, 255}, {0,255,0,255 }, {0,0,255,255}};
}
@ -245,29 +245,29 @@ void MainWindow::on_ColorSpaces_itemClicked(QListWidgetItem *item)
{
if (item->text() == "Rainbow") {
info.c = {0xFFff0000, 0xFFffa500, 0xFFffff00, 0xFF008000, 0xFF0000ff, 0xFFFF00FF};
info.c = {(LONG)0xFFff0000, (LONG)0xFFffa500, (LONG)0xFFffff00, (LONG)0xFF008000, (LONG)0xFF0000ff, (LONG)0xFFFF00FF};
info.p = {0.0,0.2,0.4,0.6,0.8,1};
info.n_colors = 6;
info.ginfo.shading.function.set_linear_interpolation({0xFFff0000, 0xFFffa500, 0xFFffff00, 0xFF008000, 0xFF0000ff, 0xFFFF00FF}
, {0.0,0.2,0.4,0.6,0.8,1});
, {0.0f,0.2f,0.4f,0.6f,0.8f,1.0f});
}
else if (item->text() == "Black and white") {
info.c = {0xFFFFFFFF, 0xFF000000};
info.c = {(LONG)0xFFFFFFFF, (LONG)0xFF000000};
info.p = {0.0, 1};
info.n_colors = 2;
info.ginfo.shading.function.set_linear_interpolation({0xFFFFFFFF, 0xFF000000}, {0.0, 1});
info.ginfo.shading.function.set_linear_interpolation({0xFFFFFFFF, 0xFF000000}, {0.0f, 1.0f});
}
else if (item->text() == "Red Blue") {
info.c = {0xFFFF0000, 0xFF0000FF};
info.c = {(LONG)0xFFFF0000, (LONG)0xFF0000FF};
info.p = {0.0, 1};
info.n_colors = 2;
info.ginfo.shading.function.set_linear_interpolation({0xFFFF0000, 0xFF0000FF}, {0.0, 1});
info.ginfo.shading.function.set_linear_interpolation({0xFFFF0000, 0xFF0000FF}, {0.0f, 1.0f});
}
else if (item->text() == "Pastel") {
info.c = {0xfff39189, 0xff046582};
info.c = {(LONG)0xfff39189, (LONG)0xff046582};
info.p = {0.0, 1};
info.n_colors = 2;
info.ginfo.shading.function.set_linear_interpolation({0xfff39189, 0xff046582}, {0.0, 1});
info.ginfo.shading.function.set_linear_interpolation({0xfff39189, 0xff046582}, {0.0f, 1.0f});
}
}

2
Test/Applications/gradient/Gradient/mainwindow.h
View File

@ -36,7 +36,7 @@ struct Info {
std::vector<double> p;
int n_colors;
Info() : gradient_type(c_BrushTypePathNewLinearGradient) {
c = {0xFFff0000, 0xFFffa500, 0xFFffff00, 0xFF008000, 0xFF0000ff, 0xFFFF00FF};
c = {(LONG)0xFFff0000, (LONG)0xFFffa500, (LONG)0xFFffff00, (LONG)0xFF008000, (LONG)0xFF0000ff, (LONG)0xFFFF00FF};
p = {0.0,0.2,0.4,0.6,0.8,1};
n_colors = 6;
};