OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0031815: Visualization, TKOpenGl - avoid XResizeWindow() within OpenGl_Window::Resize()

Browse Source 
OpenGl_Window::Resize() no more calls XResizeWindow() and relies only on dimensions returned by Aspect_Window.
Xw_Window::Size() now ignores Window in case of virtual window in similar way as WNT_Window does.
This commit is contained in:
kgv
2020-11-09 10:55:34 +03:00
committed by bugmaster
parent 0aeb898418
commit e89202ea02
2 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Xw/Xw_Window.cxx
View File

@@ -391,7 +391,7 @@ void Xw_Window::Unmap() const
// =======================================================================
Aspect_TypeOfResize Xw_Window::DoResize()
{
if (myXWindow == 0)
if (IsVirtual() || myXWindow == 0)
{
return Aspect_TOR_UNKNOWN;
}
@@ -447,9 +447,9 @@ Standard_Boolean Xw_Window::DoMapping() const
// =======================================================================
Standard_Real Xw_Window::Ratio() const
{
if (myXWindow == 0)
if (IsVirtual() || myXWindow == 0)
{
return 1.0;
return Standard_Real(myXRight - myXLeft) / Standard_Real(myYBottom - myYTop);
}
XFlush (myDisplay->GetDisplay());
@@ -462,11 +462,15 @@ Standard_Real Xw_Window::Ratio() const
// function : Position
// purpose :
// =======================================================================
void Xw_Window::Position (Standard_Integer& X1, Standard_Integer& Y1,
Standard_Integer& X2, Standard_Integer& Y2) const
void Xw_Window::Position (Standard_Integer& theX1, Standard_Integer& theY1,
Standard_Integer& theX2, Standard_Integer& theY2) const
{
if (myXWindow == 0)
if (IsVirtual() || myXWindow == 0)
{
theX1 = myXLeft;
theX2 = myXRight;
theY1 = myYTop;
theY2 = myYBottom;
return;
}
@@ -477,10 +481,10 @@ void Xw_Window::Position (Standard_Integer& X1, Standard_Integer& Y1,
XTranslateCoordinates (myDisplay->GetDisplay(), anAttributes.root, myXWindow,
0, 0, &anAttributes.x, &anAttributes.y, &aChild);
X1 = -anAttributes.x;
X2 = X1 + anAttributes.width;
Y1 = -anAttributes.y;
Y2 = Y1 + anAttributes.height;
theX1 = -anAttributes.x;
theX2 = theX1 + anAttributes.width;
theY1 = -anAttributes.y;
theY2 = theY1 + anAttributes.height;
}
// =======================================================================
@@ -490,8 +494,10 @@ void Xw_Window::Position (Standard_Integer& X1, Standard_Integer& Y1,
void Xw_Window::Size (Standard_Integer& theWidth,
Standard_Integer& theHeight) const
{
if (myXWindow == 0)
if (IsVirtual() || myXWindow == 0)
{
theWidth = myXRight - myXLeft;
theHeight = myYBottom - myYTop;
return;
}