isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove the unused attributes resize_gravity, width_inc, height_inc,

Browse Source 
2006-05-18  Björn Lindqvist  <bjourne@gmail.com>

	* resizepopup.c: Remove the unused attributes resize_gravity,
	width_inc, height_inc, min_width, min_height, frame_left,
	frame_right, frame_top, frame_bottom, tick_origin_x, tick_origin_y
	from the MetaResizePopup struct. Delete all code that references
	those attributes.
This commit is contained in:
Björn Lindqvist 2006-05-18 08:32:16 +00:00 committed by Björn Lindqvist
parent 78826fd35c
commit 23a5f5bb58
4 changed files with 11 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-05-18 Björn Lindqvist <bjourne@gmail.com>
* resizepopup.c: Remove the unused attributes resize_gravity,
width_inc, height_inc, min_width, min_height, frame_left,
frame_right, frame_top, frame_bottom, tick_origin_x, tick_origin_y
from the MetaResizePopup struct. Delete all code that references
those attributes.
2006-05-15 Elijah Newren <newren gmail com> 2006-05-15 Elijah Newren <newren gmail com>
* configure.in: post-release version bump to 2.15.5 * configure.in: post-release version bump to 2.15.5

30
src/resizepopup.c
View File

@ -40,18 +40,7 @@ struct _MetaResizePopup
gboolean showing; gboolean showing;
int resize_gravity;
MetaRectangle rect; MetaRectangle rect;
int width_inc;
int height_inc;
int min_width;
int min_height;
int frame_left;
int frame_right;
int frame_top;
int frame_bottom;
int tick_origin_x;
int tick_origin_y;
}; };
MetaResizePopup* MetaResizePopup*
@ -62,7 +51,6 @@ meta_ui_resize_popup_new (Display *display,
popup = g_new0 (MetaResizePopup, 1); popup = g_new0 (MetaResizePopup, 1);
popup->resize_gravity = -1;
popup->display = display; popup->display = display;
popup->screen_number = screen_number; popup->screen_number = screen_number;
@ -167,18 +155,11 @@ sync_showing (MetaResizePopup *popup)
void void
meta_ui_resize_popup_set (MetaResizePopup *popup, meta_ui_resize_popup_set (MetaResizePopup *popup,
int resize_gravity,
MetaRectangle rect, MetaRectangle rect,
int base_width, int base_width,
int base_height, int base_height,
int min_width,
int min_height,
int width_inc, int width_inc,
int height_inc, int height_inc)
int frame_left,
int frame_right,
int frame_top,
int frame_bottom)
{ {
gboolean need_update_size; gboolean need_update_size;
int display_w, display_h; int display_w, display_h;
@ -200,16 +181,7 @@ meta_ui_resize_popup_set (MetaResizePopup *popup,
display_h != popup->vertical_size) display_h != popup->vertical_size)
need_update_size = TRUE; need_update_size = TRUE;
popup->resize_gravity = resize_gravity;
popup->rect = rect; popup->rect = rect;
popup->min_width = min_width;
popup->min_height = min_height;
popup->width_inc = width_inc;
popup->height_inc = height_inc;
popup->frame_left = frame_left;
popup->frame_right = frame_right;
popup->frame_top = frame_top;
popup->frame_bottom = frame_bottom;
popup->vertical_size = display_h; popup->vertical_size = display_h;
popup->horizontal_size = display_w; popup->horizontal_size = display_w;

9
src/resizepopup.h
View File

@ -33,18 +33,11 @@ MetaResizePopup* meta_ui_resize_popup_new (Display *display,
int screen_number); int screen_number);
void meta_ui_resize_popup_free (MetaResizePopup *popup); void meta_ui_resize_popup_free (MetaResizePopup *popup);
void meta_ui_resize_popup_set (MetaResizePopup *popup, void meta_ui_resize_popup_set (MetaResizePopup *popup,
int resize_gravity,
MetaRectangle rect, MetaRectangle rect,
int base_width, int base_width,
int base_height, int base_height,
int min_width,
int min_height,
int width_inc, int width_inc,
int height_inc, int height_inc);
int frame_left,
int frame_right,
int frame_top,
int frame_bottom);
void meta_ui_resize_popup_set_showing (MetaResizePopup *popup, void meta_ui_resize_popup_set_showing (MetaResizePopup *popup,
gboolean showing); gboolean showing);

24
src/window.c
View File

@ -7227,23 +7227,8 @@ meta_window_refresh_resize_popup (MetaWindow *window)
if (window->display->grab_resize_popup != NULL) if (window->display->grab_resize_popup != NULL)
{ {
int gravity;
MetaRectangle rect; MetaRectangle rect;
MetaFrameGeometry fgeom;
if (window->frame)
meta_frame_calc_geometry (window->frame, &fgeom);
else
{
fgeom.left_width = 0;
fgeom.right_width = 0;
fgeom.top_height = 0;
fgeom.bottom_height = 0;
}
gravity = meta_resize_gravity_from_grab_op (window->display->grab_op);
g_assert (gravity >= 0);
if (window->display->grab_wireframe_active) if (window->display->grab_wireframe_active)
{ {
rect = window->display->grab_wireframe_rect; rect = window->display->grab_wireframe_rect;
@ -7256,18 +7241,11 @@ meta_window_refresh_resize_popup (MetaWindow *window)
} }
meta_ui_resize_popup_set (window->display->grab_resize_popup, meta_ui_resize_popup_set (window->display->grab_resize_popup,
gravity,
rect, rect,
window->size_hints.base_width, window->size_hints.base_width,
window->size_hints.base_height, window->size_hints.base_height,
window->size_hints.min_width,
window->size_hints.min_height,
window->size_hints.width_inc, window->size_hints.width_inc,
window->size_hints.height_inc, window->size_hints.height_inc);
fgeom.left_width,
fgeom.right_width,
fgeom.top_height,
fgeom.bottom_height);
meta_ui_resize_popup_set_showing (window->display->grab_resize_popup, meta_ui_resize_popup_set_showing (window->display->grab_resize_popup,
TRUE); TRUE);