jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix blurry icon in HiDPI

Browse Source
This commit is contained in:
Clement Lefebvre 2019-09-26 11:32:07 +01:00
parent cada2d72c1
commit 298719a911
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -52,7 +52,6 @@ class MainWindow(object):
sys.path.append(os.path.join(self.path, "plugins")) sys.path.append(os.path.join(self.path, "plugins"))
self.de = de self.de = de
self.icon = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png"
self.toggle = toggleButton self.toggle = toggleButton
builder = Gtk.Builder() builder = Gtk.Builder()
@ -330,6 +329,7 @@ class MenuWin(object):
self.detect_desktop_environment() self.detect_desktop_environment()
self.settings = Gio.Settings.new("com.linuxmint.mintmenu") self.settings = Gio.Settings.new("com.linuxmint.mintmenu")
self.icon_theme = Gtk.IconTheme.get_default() self.icon_theme = Gtk.IconTheme.get_default()
self.button_icon = Gtk.Image()
self.loadSettings() self.loadSettings()
self.createPanelButton() self.createPanelButton()
@ -358,9 +358,6 @@ class MenuWin(object):
self.mainwin.window.set_name("mintmenu") # Name used in Gtk RC files self.mainwin.window.set_name("mintmenu") # Name used in Gtk RC files
self.applyTheme() self.applyTheme()
if self.mainwin.icon:
Gtk.Window.set_default_icon_name(self.mainwin.icon)
try: try:
self.keybinder = keybinding.GlobalKeyBinding() self.keybinder = keybinding.GlobalKeyBinding()
if self.hotkeyText != "": if self.hotkeyText != "":
@ -425,12 +422,11 @@ class MenuWin(object):
def set_applet_icon(self, saturate=False): def set_applet_icon(self, saturate=False):
if saturate: if saturate:
self.button_icon.set_from_pixbuf(self.saturated_pixbuf) self.button_icon.set_from_surface(self.saturated_surface)
else: else:
self.button_icon.set_from_pixbuf(self.pixbuf) self.button_icon.set_from_surface(self.surface)
def createPanelButton(self): def createPanelButton(self):
self.button_icon = Gtk.Image()
self.set_applet_icon() self.set_applet_icon()
self.systemlabel = Gtk.Label(label= "%s " % self.buttonText) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText)
if os.path.isfile("/etc/linuxmint/info"): if os.path.isfile("/etc/linuxmint/info"):
@ -478,15 +474,18 @@ class MenuWin(object):
if not (os.path.exists(applet_icon) or self.icon_theme.has_icon(applet_icon)): if not (os.path.exists(applet_icon) or self.icon_theme.has_icon(applet_icon)):
self.settings.reset("applet-icon") self.settings.reset("applet-icon")
applet_icon = self.settings.get_string("applet-icon") applet_icon = self.settings.get_string("applet-icon")
self.scale = self.button_icon.get_scale_factor()
if "/" in applet_icon: if "/" in applet_icon:
if applet_icon.endswith(".svg"): if applet_icon.endswith(".svg"):
self.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(applet_icon, -1, 22) self.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(applet_icon, -1, 22 * self.scale)
else: else:
self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(applet_icon) self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(applet_icon)
else: else:
self.pixbuf = self.icon_theme.load_icon(applet_icon, 22, 0) self.pixbuf = self.icon_theme.load_icon(applet_icon, 22 * self.scale, 0)
self.surface = Gdk.cairo_surface_create_from_pixbuf(self.pixbuf, self.scale)
self.saturated_pixbuf = self.pixbuf.copy() self.saturated_pixbuf = self.pixbuf.copy()
GdkPixbuf.Pixbuf.saturate_and_pixelate(self.saturated_pixbuf, self.saturated_pixbuf, 1.5, False) GdkPixbuf.Pixbuf.saturate_and_pixelate(self.saturated_pixbuf, self.saturated_pixbuf, 1.5, False)
self.saturated_surface = Gdk.cairo_surface_create_from_pixbuf(self.saturated_pixbuf, self.scale)
self.buttonIcon = self.settings.get_string("applet-icon") self.buttonIcon = self.settings.get_string("applet-icon")
self.iconSize = self.settings.get_int("applet-icon-size") self.iconSize = self.settings.get_int("applet-icon-size")