Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use OpenGL commands only in paintGL() #261

Open
wants to merge 1 commit into
base: grbl_1_1
Choose a base branch
from
Open

Use OpenGL commands only in paintGL() #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/widgets/glwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,7 @@ void GLWidget::updateView()
m_viewMatrix.rotate(-90, 1.0, 0.0, 0.0);
}

#ifdef GLES
void GLWidget::paintGL() {
#else
void GLWidget::paintEvent(QPaintEvent *pe) {
Q_UNUSED(pe)
#endif
QPainter painter(this);

// Segment counter
Expand Down
4 changes: 0 additions & 4 deletions src/widgets/glwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,7 @@ private slots:
void resizeGL(int width, int height);
void updateProjection();
void updateView();
#ifdef GLES
void paintGL();
#else
void paintEvent(QPaintEvent *pe);
#endif

void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
Expand Down