HiDPI improvements, in particular on macOS.

Author: kpeeters

frontend/gtkmm/CodeInput.cc

@@ -28,6 +28,7 @@ CodeInput::exp_input_tv::exp_input_tv(DTree::iterator it, Glib::RefPtr<Gtk::Text
 	set_events(Gdk::STRUCTURE_MASK);
 //	get_buffer()->signal_insert().connect(sigc::mem_fun(this, &exp_input_tv::on_my_insert), false);
 //	get_buffer()->signal_erase().connect(sigc::mem_fun(this, &exp_input_tv::on_my_erase), false);
+	set_name("CodeInput"); // to be able to style it with CSS
 	}
 
 //CodeInput::CodeInput()

frontend/gtkmm/NotebookWindow.cc

@@ -39,22 +39,21 @@ NotebookWindow::NotebookWindow(Cadabra *c, bool ro)
 	// Set the window icon.
 	set_icon_name("cadabra2-gtk");
 
-	// Query high-dpi settings. For now only for cinnamon.
-	scale = 1.0;
+	// Query high-dpi settings. For all systems we can probe the
+	// HiDPI scale, and for some window managers we also probe the
+	// text scale factor.
 	auto screen = Gdk::Screen::get_default();
+	scale = screen->get_monitor_scale_factor(0);
+	display_scale = scale;	
 #ifndef __APPLE__
 	const char *ds = std::getenv("DESKTOP_SESSION");
 	if(ds) {
 	  settings = Gio::Settings::create((strcmp(ds, "cinnamon") == 0) ? "org.cinnamon.desktop.interface" : "org.gnome.desktop.interface");
-	  scale = settings->get_double("text-scaling-factor")*screen->get_monitor_scale_factor(0);
-//	  scale = screen->get_monitor_scale_factor(0);
+	  scale *= settings->get_double("text-scaling-factor");
 	}
-#else
-	scale = screen->get_monitor_scale_factor(0);
-	std::cerr << "cadabra-client: scale = " << scale << std::endl;
 #endif
-//	std::cerr << "monitor scale factor " << Gdk::Monitor::get_scale_factor() << std::endl;
-	engine.set_scale(scale, screen->get_monitor_scale_factor(0));
+
+	engine.set_scale(scale, display_scale);
 
 #ifndef __APPLE__
 	if(ds) {
@@ -381,6 +380,7 @@ void NotebookWindow::load_css(const std::string& text_colour)
 	data += "*:selected { background-color: #ccc; }\n";
 	data += "textview.error { background: transparent; -GtkWidget-cursor-aspect-ratio: 0.2; color: @theme_fg_color; }\n";
 	data += "#ImageView { transition-property: padding, background-color; transition-duration: 1s; }\n";
+	data += "#CodeInput { font-family: monospace; }\n";	
 	data += "#Console   { padding: 5px; }\n";
 	//	data += "scrolledwindow { kinetic-scrolling: false; }\n";
 
@@ -663,10 +663,10 @@ void NotebookWindow::add_cell(const DTree& tr, DTree::iterator it, bool visible)
 				CodeInput *ci;
 				// Ensure that all CodeInput cells share the same text buffer.
 				if(i==0) {
-					ci = new CodeInput(it, it->textbuf,scale,prefs);
+					ci = new CodeInput(it, it->textbuf,scale/display_scale,prefs);
 					global_buffer=ci->buffer;
 					}
-				else ci = new CodeInput(it, global_buffer,scale,prefs);
+				else ci = new CodeInput(it, global_buffer,scale/display_scale,prefs);
 				if(read_only)
 					ci->edit.set_editable(false);
 				ci->get_style_context()->add_provider(css_provider, GTK_STYLE_PROVIDER_PRIORITY_USER);

frontend/gtkmm/NotebookWindow.hh

@@ -60,7 +60,8 @@ namespace cadabra {
 
 		// TeX stuff
 		TeXEngine        engine;
-		double           scale; // highdpi scale
+		double           scale; // total scale factor (hdpi and textscale)
+   	double           display_scale; // hdpi scale only
 
 								// Handler for vertical scrollbar changes.
 		bool on_vscroll_changed(Gtk::ScrollType, double);

frontend/gtkmm/TeXView.cc

@@ -121,7 +121,7 @@ bool TeXView::TeXArea::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
 	double device_scale_x, device_scale_y;
 	cairo_surface_get_device_scale(csurface, &device_scale_x, &device_scale_y);
 //	std::cerr << device_scale_x << std::endl;
-	set_size_request(pixbuf->get_width()/device_scale_x, pixbuf->get_height()/device_scale_y);
+	set_size_request(pixbuf->get_width()/device_scale_x, pixbuf->get_height()/device_scale_y+1);
 	cr->scale(1.0/device_scale_x, 1.0/device_scale_y);
 	Gdk::Cairo::set_source_pixbuf(cr, pixbuf, 0, 0);
 	cr->paint();

tests/CMakeLists.txt

@@ -49,7 +49,7 @@ foreach(NBTEST ${NBTESTS})
 	 COMMAND cadabra2cadabra
 	 ARGS    ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
 	 COMMENT "Creating ${NBTEST} notebook...")
-  add_custom_target("${NBTEST}_test" ALL echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb)
+  add_custom_target("${NBTEST}_test" ALL /bin/echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb)
   add_test(${NBTEST}  ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb)
   set_tests_properties(${NBTEST}      PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHONPATH};LANG=en_US.UTF-8;LC_ALL=en_US.UTF-8;PYTHONIOENCODING=utf-8")    
 endforeach()