Skip to content

Commit

Permalink
make it clear that this method returns the geometry of the drawing area
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@23306 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 25, 2019
1 parent cd1c1cd commit 843ad08
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/xpra/client/gtk2/gtk2_window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def xget_u32_property(self, target, name):
def is_mapped(self):
return self.window is not None and self.window.is_visible()

def get_window_geometry(self):
def get_drawing_area_geometry(self):
gdkwindow = self.get_window()
x, y = gdkwindow.get_origin()
w, h = gdkwindow.get_geometry()[2:4]
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/client/gtk3/client_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def xget_u32_property(self, target, name):
def is_mapped(self):
return self.get_mapped()

def get_window_geometry(self):
def get_drawing_area_geometry(self):
gdkwindow = self.drawing_area.get_window()
x, y = gdkwindow.get_origin()[1:]
w, h = self.get_size()
Expand Down
6 changes: 3 additions & 3 deletions src/xpra/client/gtk_base/gtk_client_window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ def do_map_event(self, event):
self.process_map_event()

def process_map_event(self):
x, y, w, h = self.get_window_geometry()
x, y, w, h = self.get_drawing_area_geometry()
state = self._window_state
props = self._client_properties
self._client_properties = {}
Expand Down Expand Up @@ -1763,7 +1763,7 @@ def do_configure_event(self, event):

def process_configure_event(self, skip_geometry=False):
assert skip_geometry or not self.is_OR()
x, y, w, h = self.get_window_geometry()
x, y, w, h = self.get_drawing_area_geometry()
w = max(1, w)
h = max(1, h)
ox, oy = self._pos
Expand All @@ -1786,7 +1786,7 @@ def process_configure_event(self, skip_geometry=False):

def send_configure_event(self, skip_geometry=False):
assert skip_geometry or not self.is_OR()
x, y, w, h = self.get_window_geometry()
x, y, w, h = self.get_drawing_area_geometry()
w = max(1, w)
h = max(1, h)
state = self._window_state
Expand Down

0 comments on commit 843ad08

Please sign in to comment.