p/logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Compare commits

base: p:de291ffddb3c92252199dc424d68c2adc84c53f8
Branches Tags
p:master
p:v0.3.0 p:v0.2.1 p:v0.2.0 p:v0.1.2 p:v0.1.1 p:v0.1.0
...
compare: p:66a3b3e259e8d46a046b3b4b9a9253dd3e2a394e
Branches Tags
p:master
p:v0.3.0 p:v0.2.1 p:v0.2.0 p:v0.1.2 p:v0.1.1 p:v0.1.0

2 Commits
de291ffddb ... 66a3b3e259

Author SHA1 Message Date
Přemysl Eric Janouch
66a3b3e259 CMakeLists.txt: fix macOS build 
GTK+ doesn't seem to be working much on macOS/brew/M1, though.
 2021-11-02 16:29:30 +01:00
Přemysl Eric Janouch
3ff0f117f9 Make note of an alternative export approach 2021-11-02 11:43:49 +01:00
2 changed files with 5 additions and 3 deletions
Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -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)

3
liblogdiag/ld-diagram-view.c
View File

@@ -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);