summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2020-03-09 07:57:26 -0400
committerraveit65 <[email protected]>2020-04-02 16:16:24 +0200
commit3a36bf7b55ff3da09cf6ff181be27e9f9b7cd97b (patch)
treecc404b0c27d5dc280b8ef46274c7a17632591894
parentbea866ad354a16b22674074056e06869685c8911 (diff)
downloadmarco-3a36bf7b55ff3da09cf6ff181be27e9f9b7cd97b.tar.bz2
marco-3a36bf7b55ff3da09cf6ff181be27e9f9b7cd97b.tar.xz
Remove unnecessary warnings about visible region
Also reformat recent code change to fix styling issues.
-rw-r--r--src/compositor/compositor-xrender.c6
-rw-r--r--src/core/frame.c13
2 files changed, 8 insertions, 11 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 4a05bc7a..59fbd93f 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -1153,13 +1153,9 @@ border_size (MetaCompWindow *cw)
{
visible_region = meta_window_get_frame_bounds (cw->window);
- if (visible_region != NULL) {
+ if (visible_region != NULL)
visible = cairo_region_to_xserver_region (xdisplay, visible_region);
- }
- else {
- g_warning ("Visible region is null");
}
- }
meta_error_trap_push (display);
border = XFixesCreateRegionFromWindow (xdisplay, cw->id,
diff --git a/src/core/frame.c b/src/core/frame.c
index e28d669c..86b78f1f 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -407,12 +407,13 @@ meta_frame_sync_to_window (MetaFrame *frame,
cairo_region_t *
meta_frame_get_frame_bounds (MetaFrame *frame)
{
- if(frame->xwindow && frame->window !=NULL && frame->window->screen !=NULL && frame->window->screen->ui !=NULL) {
- return meta_ui_get_frame_bounds (frame->window->screen->ui,
- frame->xwindow,
- frame->rect.width,
- frame->rect.height);
- }
+ if (frame->xwindow && frame->window != NULL && frame->window->screen != NULL && frame->window->screen->ui != NULL)
+ {
+ return meta_ui_get_frame_bounds (frame->window->screen->ui,
+ frame->xwindow,
+ frame->rect.width,
+ frame->rect.height);
+ }
return NULL;
}