diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/boxes.c | 22 | ||||
| -rw-r--r-- | src/core/testboxes.c | 5 | ||||
| -rw-r--r-- | src/core/workspace.c | 6 |
3 files changed, 28 insertions, 5 deletions
diff --git a/src/core/boxes.c b/src/core/boxes.c index 3e75042f..80179ca8 100644 --- a/src/core/boxes.c +++ b/src/core/boxes.c @@ -518,7 +518,8 @@ compare_rect_areas (gconstpointer a, gconstpointer b) GList* meta_rectangle_get_minimal_spanning_set_for_region ( const MetaRectangle *basic_rect, - const GSList *all_struts) + const GSList *all_struts, + gboolean skip_middle_struts) { /* NOTE FOR OPTIMIZERS: This function *might* be somewhat slow, * especially due to the call to merge_spanning_rects_in_region() (which @@ -580,7 +581,24 @@ meta_rectangle_get_minimal_spanning_set_for_region ( for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next) { GList *rect_iter; - MetaRectangle *strut_rect = &((MetaEdge *)strut_iter->data)->rect; + MetaEdge *strut = (MetaEdge *) strut_iter->data; + MetaRectangle *strut_rect = &strut->rect; + + if (skip_middle_struts && + strut->edge_type == META_EDGE_MONITOR) + { + if ((strut->side_type == META_SIDE_LEFT && + strut_rect->x != basic_rect->x) || + (strut->side_type == META_SIDE_RIGHT && + strut_rect->x + strut_rect->width != basic_rect->width) || + (strut->side_type == META_SIDE_TOP && + strut_rect->y != basic_rect->y) || + (strut->side_type == META_SIDE_BOTTOM && + strut_rect->y + strut_rect->height != basic_rect->height)) + { + continue; + } + } tmp_list = ret; ret = NULL; diff --git a/src/core/testboxes.c b/src/core/testboxes.c index 415b4048..b228f424 100644 --- a/src/core/testboxes.c +++ b/src/core/testboxes.c @@ -290,7 +290,10 @@ get_screen_region (int which) ret = NULL; struts = get_strut_list (which); - ret = meta_rectangle_get_minimal_spanning_set_for_region (&basic_rect, struts); + ret = meta_rectangle_get_minimal_spanning_set_for_region (&basic_rect, + struts, + FALSE); + free_strut_list (struts); return ret; diff --git a/src/core/workspace.c b/src/core/workspace.c index 6c0fc1b8..35b180af 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -646,12 +646,14 @@ ensure_work_areas_validated (MetaWorkspace *workspace) workspace->monitor_region[i] = meta_rectangle_get_minimal_spanning_set_for_region ( &workspace->screen->monitor_infos[i].rect, - workspace->all_struts); + workspace->all_struts, + FALSE); } workspace->screen_region = meta_rectangle_get_minimal_spanning_set_for_region ( &workspace->screen->rect, - workspace->all_struts); + workspace->all_struts, + TRUE); /* STEP 3: Get the work areas (region-to-maximize-to) for the screen and * monitors. |