kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

NaviCube: Improve the widget style

Browse Source 
This resizes down the cube, adjusts transparency and
text readability. Arrows and cube corners sizes were
adjusted.
This commit is contained in:
Jakub Tyszkowski
2019-04-08 00:43:12 +02:00
committed by Yorik van Havre
parent ae8dea56fb
commit af734bbbc6
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Gui/NaviCube.cpp
View File

@@ -307,12 +307,12 @@ void NaviCube::setCorner(Corner c) {
NaviCubeImplementation::NaviCubeImplementation(
Gui::View3DInventorViewer* viewer) {
m_View3DInventorViewer = viewer;
m_FrontFaceColor = QColor(255,255,255,192);
m_BackFaceColor = QColor(226,233,239);
m_FrontFaceColor = QColor(255,255,255,128);
m_BackFaceColor = QColor(226,233,239,128);
m_HiliteColor = QColor(170,226,247);
m_ButtonColor = QColor(226,233,239);
m_ButtonColor = QColor(226,233,239,128);
m_PickingFramebuffer = NULL;
m_CubeWidgetSize = 150;
m_CubeWidgetSize = 132;
m_Menu = createNaviCubeMenu();
}
@@ -371,7 +371,8 @@ GLuint NaviCubeImplementation::createCubeFaceTex(QtGLWidget* gl, float gap, floa
if (text) {
paint.setPen(Qt::white);
QFont sansFont(str("Helvetica"), 0.1875 * texSize);
QFont sansFont(str("Helvetica"), 0.18 * texSize);
sansFont.setStretch(QFont::ExtraCondensed);
paint.setFont(sansFont);
paint.drawText(QRect(0, 0, texSize, texSize), Qt::AlignCenter,qApp->translate("Gui::NaviCube",text));
}
@@ -409,7 +410,7 @@ GLuint NaviCubeImplementation::createButtonTex(QtGLWidget* gl, int button) {
QPainterPath path;
float as1 = 0.12f; // arrow size
float as1 = 0.18f; // arrow size
float as3 = as1 / 3;
switch (button) {
@@ -430,7 +431,7 @@ GLuint NaviCubeImplementation::createButtonTex(QtGLWidget* gl, int button) {
float a0 = 72;
float a1 = 45;
float a2 = 38;
float a2 = 32;
if (TEX_ARROW_LEFT == button) {
a0 = 180 - a0;
@@ -676,12 +677,12 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) {
if (labels.size() != 6) {
labels.clear();
labels.push_back("Front");
labels.push_back("Rear");
labels.push_back("Top");
labels.push_back("Bottom");
labels.push_back("Right");
labels.push_back("Left");
labels.push_back("FRONT");
labels.push_back("REAR");
labels.push_back("TOP");
labels.push_back("BOTTOM");
labels.push_back("RIGHT");
labels.push_back("LEFT");
}
float gap = 0.12f;
@@ -726,8 +727,8 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) {
z = r45z * r45x * z;
x = r45z * r45x * x;
x *= 0.25f; // corner face size
z *= 1.45f; // corner face position
x *= 0.23f; // corner face size
z *= 1.43f; // corner face position
addFace(x, z, TEX_CORNER_FACE, TEX_CORNER_FACE, TEX_CORNER_FACE, TEX_BOTTOM_RIGHT_REAR);
@@ -1000,7 +1001,7 @@ void NaviCubeImplementation::drawNaviCube(bool pickMode) {
glColor3ub(*b, 0, 0);
else {
QColor& c = (m_HiliteId ==(*b)) ? m_HiliteColor : m_ButtonColor;
glColor3f(c.redF(), c.greenF(), c.blueF());
glColor4f(c.redF(), c.greenF(), c.blueF(), c.alphaF());
}
glBindTexture(GL_TEXTURE_2D, m_Textures[*b]);
@@ -1038,8 +1039,9 @@ void NaviCubeImplementation::drawNaviCube(bool pickMode) {
glVertex3f(0.0f, 0.0f, 0.0f);
glEnd();
}
glColor3ub(255,255,255);
QColor& c = m_ButtonColor;
glColor4f(c.redF(), c.greenF(), c.blueF(), c.alphaF());
glBindTexture(GL_TEXTURE_2D, m_Textures[TEX_VIEW_MENU_ICON]);
}