diff options
author | David Robillard <d@drobilla.net> | 2014-04-26 16:49:15 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-04-26 16:49:15 +0000 |
commit | 65b14544b89afc3a7d3a7de57e6ef15ca8165bd0 (patch) | |
tree | aff9e8f19197c83df67ff723ea154b7573880cdb /src/module.c | |
parent | fb3498abb00ed3cf5c5938fcb1bffef163674274 (diff) | |
download | ganv-65b14544b89afc3a7d3a7de57e6ef15ca8165bd0.tar.gz ganv-65b14544b89afc3a7d3a7de57e6ef15ca8165bd0.tar.bz2 ganv-65b14544b89afc3a7d3a7de57e6ef15ca8165bd0.zip |
Clean up Ganv API.
git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@5367 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/module.c')
-rw-r--r-- | src/module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/module.c b/src/module.c index c8da4d2..d630ec8 100644 --- a/src/module.c +++ b/src/module.c @@ -148,7 +148,7 @@ measure(GanvModule* module, Metrics* m) double title_w, title_h; title_size(module, &title_w, &title_h); - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); GanvText* canvas_title = GANV_NODE(module)->impl->label; GanvModuleImpl* impl = module->impl; @@ -253,7 +253,7 @@ place_title(GanvModule* module, GanvDirection dir) static void resize_right(GanvModule* module) { - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); GanvModuleImpl* impl = module->impl; Metrics m; @@ -331,7 +331,7 @@ resize_right(GanvModule* module) static void resize_down(GanvModule* module) { - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); GanvModuleImpl* impl = module->impl; Metrics m; @@ -414,7 +414,7 @@ layout(GanvNode* self) GanvModule* module = GANV_MODULE(self); GanvModuleImpl* impl = module->impl; GanvNode* node = GANV_NODE(self); - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); double label_w = 0.0; double label_h = 0.0; @@ -468,7 +468,7 @@ static void ganv_module_add_port(GanvModule* module, GanvPort* port) { - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); GanvModuleImpl* impl = module->impl; const double width = ganv_port_get_natural_width(port); @@ -640,7 +640,7 @@ ganv_module_point(GanvItem* item, double x, double y, GanvItem** actual_item) *actual_item = NULL; d = GANV_ITEM_GET_CLASS(port)->point( - port, x - port->x, y - port->y, actual_item); + port, x - port->impl->x, y - port->impl->y, actual_item); if (*actual_item) { // Point is inside a port @@ -719,7 +719,7 @@ ganv_module_get_empty_port_breadth(const GanvModule* module) double ganv_module_get_empty_port_depth(const GanvModule* module) { - GanvCanvas* canvas = GANV_CANVAS(GANV_ITEM(module)->canvas); + GanvCanvas* canvas = ganv_item_get_canvas(GANV_ITEM(module)); return ganv_canvas_get_font_size(canvas) * 1.1; } |