/[packages]/updates/6/chromium-browser-stable/current/SOURCES/chromium-60-gtk2.patch
ViewVC logotype

Diff of /updates/6/chromium-browser-stable/current/SOURCES/chromium-60-gtk2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1155138 by neoclust, Thu Aug 10 23:11:02 2017 UTC revision 1155139 by cjw, Mon Sep 18 00:07:43 2017 UTC
# Line 1  Line 1 
1  --- chromium-60.0.3112.50/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2     2017-06-29 00:02:56.000000000 +0200  --- chromium-61.0.3153.0/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2      2017-07-16 17:23:20.214034853 +0200
2  +++ chromium-60.0.3112.50/chrome/browser/ui/libgtkui/gtk_ui.cc  2017-06-30 22:05:13.566662306 +0200  +++ chromium-61.0.3153.0/chrome/browser/ui/libgtkui/gtk_ui.cc   2017-07-16 17:33:21.627414676 +0200
3  @@ -320,8 +320,14 @@  @@ -1053,7 +1053,13 @@
4       return display::Display::GetForcedDeviceScaleFactor();       return display::Display::GetForcedDeviceScaleFactor();
5    
6     GdkScreen* screen = gdk_screen_get_default();     GdkScreen* screen = gdk_screen_get_default();
7  -  gint scale = gdk_screen_get_monitor_scale_factor(  -  gint scale = gtk_widget_get_scale_factor(fake_window_);
8  -      screen, gdk_screen_get_primary_monitor(screen));  +  gint scale =
 +  gint scale =  
9  +#if GTK_MAJOR_VERSION == 2  +#if GTK_MAJOR_VERSION == 2
10  +  1  +  1
11  +#else  +#else
12  +  gdk_screen_get_monitor_scale_factor(  +  gtk_widget_get_scale_factor(fake_window_)
 +      screen, gdk_screen_get_primary_monitor(screen))  
13  +#endif  +#endif
14  +  ;  +  ;
15     gdouble resolution = gdk_screen_get_resolution(screen);     gdouble resolution = gdk_screen_get_resolution(screen);
16     return resolution <= 0 ? scale : resolution * scale / kDefaultDPI;     const float scale_factor =
17   }         resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
Legend:
Removed from v.1155138  
changed lines
  Added in v.1155139
  ViewVC Help
Powered by ViewVC 1.1.30