Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/linux_colorpicker.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import sys

wx = None
Gtk = None

try:
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from gi.repository import Gdk
except ImportError:
try:
import gtk as Gtk
Expand All @@ -24,7 +24,6 @@

def open_color_picker_via_gtk():
color_sel = Gtk.ColorSelectionDialog("Sublime Color Picker")

if len(sys.argv) > 1:
current_color = Gdk.color_parse(sys.argv[1])
if current_color:
Expand Down
10 changes: 7 additions & 3 deletions sublimecp.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import os
from stat import *

sublime_version = 2
sublime_version = 3

if not sublime.version() or int(sublime.version()) > 3000:
sublime_version = 3
if not sublime.version() or int(sublime.version()) > 4000:
sublime_version = 4

if sublime.platform() == 'windows':

Expand Down Expand Up @@ -362,13 +362,17 @@ def run(self, settings):
class ColorPickCommand(sublime_plugin.TextCommand):
def run(self, edit):
sel = self.view.sel()

selected = None
prefix = '#'

# get the currently selected color - if any
if len(sel) > 0:
selected = self.view.substr(self.view.word(sel[0])).strip()
if selected.startswith('#'):
selected = selected[1:]
elif selected.startswith('\''):
selected = selected[2:]
elif selected.startswith('0x'):
selected = selected[2:]
prefix = '0x'
Expand Down