Compare commits
2 Commits
de291ffddb
...
66a3b3e259
Author | SHA1 | Date | |
---|---|---|---|
66a3b3e259 | |||
3ff0f117f9 |
@ -68,9 +68,11 @@ endif ()
|
|||||||
# Dependencies
|
# Dependencies
|
||||||
find_package (PkgConfig REQUIRED)
|
find_package (PkgConfig REQUIRED)
|
||||||
pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
|
pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
|
||||||
|
link_directories (${GTK3_LIBRARY_DIRS})
|
||||||
|
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
|
pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
|
||||||
|
link_directories (${Lua_LIBRARY_DIRS})
|
||||||
else ()
|
else ()
|
||||||
# For whatever reason this now seems to be required
|
# For whatever reason this now seems to be required
|
||||||
set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
|
set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
|
||||||
@ -83,9 +85,6 @@ else ()
|
|||||||
set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
|
set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# This actually fucks up MinGW cross-compilation if omitted
|
|
||||||
link_directories (${GTK3_LIBRARY_DIRS})
|
|
||||||
|
|
||||||
# Localization
|
# Localization
|
||||||
find_package (Gettext REQUIRED)
|
find_package (Gettext REQUIRED)
|
||||||
file (GLOB project_PO_FILES ${PROJECT_SOURCE_DIR}/po/*.po)
|
file (GLOB project_PO_FILES ${PROJECT_SOURCE_DIR}/po/*.po)
|
||||||
|
@ -3002,6 +3002,9 @@ ld_diagram_view_get_export_bounds (LdDiagramView *self, LdRectangle *rect)
|
|||||||
{
|
{
|
||||||
LdRectangle intermediate;
|
LdRectangle intermediate;
|
||||||
|
|
||||||
|
/* Presumably, cairo_recording_surface_ink_extents() could also be used,
|
||||||
|
* though DrawData::exposed_rect currently stands in the way.
|
||||||
|
*/
|
||||||
get_diagram_bounds (self, &intermediate);
|
get_diagram_bounds (self, &intermediate);
|
||||||
ld_diagram_view_diagram_to_widget_coords_rect (self, &intermediate, rect);
|
ld_diagram_view_diagram_to_widget_coords_rect (self, &intermediate, rect);
|
||||||
return ld_diagram_view_get_scale_in_px (self);
|
return ld_diagram_view_get_scale_in_px (self);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user