Merge pull request #1268 from ixjlyons/dock-container-none

Check for container before setting dock orientation
This commit is contained in:
Ogi Moore 2020-06-22 19:58:59 -07:00 committed by GitHub
commit 6643d73903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from ..Qt import QtCore, QtGui from ..Qt import QtCore, QtGui
from .DockDrop import * from .DockDrop import *
@ -138,6 +139,12 @@ class Dock(QtGui.QWidget, DockDrop):
By default ('auto'), the orientation is determined By default ('auto'), the orientation is determined
based on the aspect ratio of the Dock. based on the aspect ratio of the Dock.
""" """
# setOrientation may be called before the container is set in some cases
# (via resizeEvent), so there's no need to do anything here until called
# again by containerChanged
if self.container() is None:
return
if o == 'auto' and self.autoOrient: if o == 'auto' and self.autoOrient:
if self.container().type() == 'tab': if self.container().type() == 'tab':
o = 'horizontal' o = 'horizontal'