zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Tooltip background is now set through css instead of using deprecated functions

merge-requests/382/head
eidheim 8 years ago
parent
3d166a8988
commit
5d78509239
11 changed files with 89 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/autocomplete.cc
  2. 2
      src/notebook.cc
  3. 2
      src/project.cc
  4. 63
      src/source.cc
  5. 11
      src/source.h
  6. 6
      src/source_clang.cc
  7. 4
      src/source_language_protocol.cc
  8. 19
      src/tooltips.cc
  9. 40
      src/window.cc
  10. 3
      src/window.h
  11. 10
      tests/source_test.cc

2
src/autocomplete.cc
Unescape View File

@ -158,7 +158,7 @@ void Autocomplete::setup_dialog() {
auto create_tooltip_buffer = [ this, tooltip = std::move(tooltip) ]() { auto create_tooltip_buffer = [ this, tooltip = std::move(tooltip) ]() {
auto tooltip_buffer = Gtk::TextBuffer::create(view->get_buffer()->get_tag_table()); auto tooltip_buffer = Gtk::TextBuffer::create(view->get_buffer()->get_tag_table());
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), tooltip, "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), tooltip);
return tooltip_buffer; return tooltip_buffer;
}; };

2
src/notebook.cc
Unescape View File

@ -41,8 +41,6 @@ Notebook::TabLabel::TabLabel(const boost::filesystem::path &path, std::function<
} }
Notebook::Notebook() : Gtk::Paned(), notebooks(2) { Notebook::Notebook() : Gtk::Paned(), notebooks(2) {
Gsv::init();
for(auto &notebook: notebooks) { for(auto &notebook: notebooks) {
notebook.get_style_context()->add_class("juci_notebook"); notebook.get_style_context()->add_class("juci_notebook");
notebook.set_scrollable(); notebook.set_scrollable();

2
src/project.cc
Unescape View File

@ -615,7 +615,7 @@ void Project::LLDB::debug_show_variables() {
value.replace(iter, next_char_iter, "?"); value.replace(iter, next_char_iter, "?");
} }
if(view) if(view)
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), value.substr(0, value.size()-1), "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), value.substr(0, value.size()-1));
else else
tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), value.substr(0, value.size()-1)); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), value.substr(0, value.size()-1));
} }

63
src/source.cc
Unescape View File

@ -18,26 +18,19 @@
#include <regex> #include <regex>
#include <limits> #include <limits>
// TODO 2019: Remove workarounds when Debian stable and FreeBSD has newer glibmm packages Glib::RefPtr<Gsv::LanguageManager> Source::LanguageManager::get_default() {
#if GLIBMM_MAJOR_VERSION>2 || (GLIBMM_MAJOR_VERSION==2 && (GLIBMM_MINOR_VERSION>51 || (GLIBMM_MINOR_VERSION==51 && GLIBMM_MICRO_VERSION>=2))) static auto instance = Gsv::LanguageManager::create();
using LanguageManager = Gsv::LanguageManager; return instance;
using StyleSchemeManager = Gsv::StyleSchemeManager; }
#else Glib::RefPtr<Gsv::StyleSchemeManager> Source::StyleSchemeManager::get_default() {
class LanguageManager { static auto instance = Gsv::StyleSchemeManager::create();
public: static bool first = true;
static Glib::RefPtr<Gsv::LanguageManager> get_default() { if(first) {
static auto instance = Gsv::LanguageManager::create(); instance->prepend_search_path((Config::get().home_juci_path/"styles").string());
return instance; first=false;
} }
}; return instance;
class StyleSchemeManager { }
public:
static Glib::RefPtr<Gsv::StyleSchemeManager> get_default() {
static auto instance = Gsv::StyleSchemeManager::create();
return instance;
}
};
#endif
Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) { Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) {
auto language_manager=LanguageManager::get_default(); auto language_manager=LanguageManager::get_default();
@ -143,8 +136,6 @@ Source::View::View(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::L
get_buffer()->create_tag("def:warning_underline"); get_buffer()->create_tag("def:warning_underline");
get_buffer()->create_tag("def:error"); get_buffer()->create_tag("def:error");
get_buffer()->create_tag("def:error_underline"); get_buffer()->create_tag("def:error_underline");
get_buffer()->create_tag("def:note_background");
get_buffer()->create_tag("def:note");
auto mark_attr_debug_breakpoint=Gsv::MarkAttributes::create(); auto mark_attr_debug_breakpoint=Gsv::MarkAttributes::create();
Gdk::RGBA rgba; Gdk::RGBA rgba;
@ -418,23 +409,10 @@ void Source::View::configure() {
SpellCheckView::configure(); SpellCheckView::configure();
DiffView::configure(); DiffView::configure();
auto style_scheme_manager=StyleSchemeManager::get_default();
static std::string juci_search_path=(Config::get().home_juci_path/"styles").string();
bool found_juci_search_path=false;
for(auto &search_path: style_scheme_manager->get_search_path()) {
if(search_path==juci_search_path) {
found_juci_search_path=true;
break;
}
}
if(!found_juci_search_path)
style_scheme_manager->prepend_search_path(juci_search_path);
if(Config::get().source.style.size()>0) { if(Config::get().source.style.size()>0) {
auto scheme = style_scheme_manager->get_scheme(Config::get().source.style); auto scheme = StyleSchemeManager::get_default()->get_scheme(Config::get().source.style);
if(scheme) if(scheme)
get_source_buffer()->set_style_scheme(scheme); get_source_buffer()->set_style_scheme(scheme);
else
Terminal::get().print("Error: Could not find gtksourceview style: "+Config::get().source.style+'\n', true);
} }
set_draw_spaces(parse_show_whitespace_characters(Config::get().source.show_whitespace_characters)); set_draw_spaces(parse_show_whitespace_characters(Config::get().source.show_whitespace_characters));
@ -492,17 +470,6 @@ void Source::View::configure() {
diagnostic_tag_underline->set_property("underline-rgba", Gdk::RGBA(error_property)); diagnostic_tag_underline->set_property("underline-rgba", Gdk::RGBA(error_property));
} }
//TODO: clear tag_class and param_spec? //TODO: clear tag_class and param_spec?
//Add tooltip foreground and background
style = scheme->get_style("def:note");
auto note_tag=get_buffer()->get_tag_table()->lookup("def:note_background");
if(style->property_background_set()) {
note_tag->property_background()=style->property_background();
}
note_tag=get_buffer()->get_tag_table()->lookup("def:note");
if(style->property_foreground_set()) {
note_tag->property_foreground()=style->property_foreground();
}
if(Config::get().menu.keys["source_show_completion"].empty()) { if(Config::get().menu.keys["source_show_completion"].empty()) {
get_completion()->unblock_interactive(); get_completion()->unblock_interactive();
@ -1198,7 +1165,7 @@ void Source::View::add_diagnostic_tooltip(const Gtk::TextIter &start, const Gtk:
auto create_tooltip_buffer=[this, spelling=std::move(spelling), error, severity_tag_name]() { auto create_tooltip_buffer=[this, spelling=std::move(spelling), error, severity_tag_name]() {
auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table()); auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table());
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), error ? "Error" : "Warning", severity_tag_name); tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), error ? "Error" : "Warning", severity_tag_name);
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), ":\n"+spelling, "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), ":\n"+spelling);
return tooltip_buffer; return tooltip_buffer;
}; };
diagnostic_tooltips.emplace_back(create_tooltip_buffer, this, get_buffer()->create_mark(start), get_buffer()->create_mark(end)); diagnostic_tooltips.emplace_back(create_tooltip_buffer, this, get_buffer()->create_mark(start), get_buffer()->create_mark(end));

11
src/source.h
Unescape View File

@ -10,6 +10,17 @@
#include <tuple> #include <tuple>
namespace Source { namespace Source {
/// Workaround for buggy Gsv::LanguageManager::get_default()
class LanguageManager {
public:
static Glib::RefPtr<Gsv::LanguageManager> get_default();
};
/// Workaround for buggy Gsv::StyleSchemeManager::get_default()
class StyleSchemeManager {
public:
static Glib::RefPtr<Gsv::StyleSchemeManager> get_default();
};
Glib::RefPtr<Gsv::Language> guess_language(const boost::filesystem::path &file_path); Glib::RefPtr<Gsv::Language> guess_language(const boost::filesystem::path &file_path);
class Offset { class Offset {

6
src/source_clang.cc
Unescape View File

@ -373,10 +373,10 @@ void Source::ClangViewParse::show_type_tooltips(const Gdk::Rectangle &rectangle)
auto end=get_buffer()->get_iter_at_line_index(token_offsets.second.line-1, token_offsets.second.index-1); auto end=get_buffer()->get_iter_at_line_index(token_offsets.second.line-1, token_offsets.second.index-1);
auto create_tooltip_buffer=[this, &token, &start, &end]() { auto create_tooltip_buffer=[this, &token, &start, &end]() {
auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table()); auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table());
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), "Type: "+token.get_cursor().get_type_description(), "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), "Type: "+token.get_cursor().get_type_description());
auto brief_comment=token.get_cursor().get_brief_comments(); auto brief_comment=token.get_cursor().get_brief_comments();
if(brief_comment!="") if(brief_comment!="")
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), "\n\n"+brief_comment, "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), "\n\n"+brief_comment);
#ifdef JUCI_ENABLE_DEBUG #ifdef JUCI_ENABLE_DEBUG
if(Debug::LLDB::get().is_stopped()) { if(Debug::LLDB::get().is_stopped()) {
@ -421,7 +421,7 @@ void Source::ClangViewParse::show_type_tooltips(const Gdk::Rectangle &rectangle)
next_char_iter++; next_char_iter++;
debug_value.replace(iter, next_char_iter, "?"); debug_value.replace(iter, next_char_iter, "?");
} }
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), "\n\n"+value_type+": "+debug_value.substr(pos+3, debug_value.size()-(pos+3)-1), "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), "\n\n"+value_type+": "+debug_value.substr(pos+3, debug_value.size()-(pos+3)-1));
} }
} }
} }

4
src/source_language_protocol.cc
Unescape View File

@ -963,7 +963,7 @@ void Source::LanguageProtocolView::show_type_tooltips(const Gdk::Rectangle &rect
type_tooltips.clear(); type_tooltips.clear();
auto create_tooltip_buffer=[this, offset, content=std::move(content)]() { auto create_tooltip_buffer=[this, offset, content=std::move(content)]() {
auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table()); auto tooltip_buffer=Gtk::TextBuffer::create(get_buffer()->get_tag_table());
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), content, "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), content);
#ifdef JUCI_ENABLE_DEBUG #ifdef JUCI_ENABLE_DEBUG
if(language_id=="rust" && capabilities.definition) { if(language_id=="rust" && capabilities.definition) {
@ -991,7 +991,7 @@ void Source::LanguageProtocolView::show_type_tooltips(const Gdk::Rectangle &rect
next_char_iter++; next_char_iter++;
debug_value.replace(iter, next_char_iter, "?"); debug_value.replace(iter, next_char_iter, "?");
} }
tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), "\n\n"+value_type+": "+debug_value.substr(pos+3, debug_value.size()-(pos+3)-1), "def:note"); tooltip_buffer->insert(tooltip_buffer->get_insert()->get_iter(), "\n\n"+value_type+": "+debug_value.substr(pos+3, debug_value.size()-(pos+3)-1));
} }
} }
} }

19
src/tooltips.cc
Unescape View File

@ -66,23 +66,24 @@ void Tooltip::show(bool disregard_drawn, const std::function<void()> &on_motion)
if(visual) if(visual)
gtk_widget_set_visual(reinterpret_cast<GtkWidget*>(window->gobj()), visual->gobj()); gtk_widget_set_visual(reinterpret_cast<GtkWidget*>(window->gobj()), visual->gobj());
auto box=Gtk::manage(new Gtk::Box()); auto box=Gtk::manage(new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
box->get_style_context()->add_class("juci_tooltip_box"); box->get_style_context()->add_class("juci_tooltip_box");
window->add(*box); window->add(*box);
text_buffer=create_tooltip_buffer(); text_buffer=create_tooltip_buffer();
wrap_lines(); wrap_lines();
auto tooltip_text_view=Gtk::manage(new Gtk::TextView(text_buffer));
auto tooltip_text_view=Gtk::manage(new Gtk::TextView(text_buffer));
tooltip_text_view->get_style_context()->add_class("juci_tooltip_text_view");
tooltip_text_view->set_editable(false); tooltip_text_view->set_editable(false);
if(text_view) {
auto tag=text_view->get_buffer()->get_tag_table()->lookup("def:note_background"); #if GTK_VERSION_GE(3, 20)
box->override_background_color(tag->property_background_rgba());
tooltip_text_view->override_background_color(tag->property_background_rgba());
}
else
box->override_background_color(tooltip_text_view->get_style_context()->get_background_color());
box->add(*tooltip_text_view); box->add(*tooltip_text_view);
#else
auto box2=Gtk::manage(new Gtk::Box());
box2->pack_start(*tooltip_text_view, true, true, 3);
box->pack_start(*box2, true, true, 3);
#endif
auto layout=Pango::Layout::create(tooltip_text_view->get_pango_context()); auto layout=Pango::Layout::create(tooltip_text_view->get_pango_context());
layout->set_text(text_buffer->get_text()); layout->set_text(text_buffer->get_text());

40
src/window.cc
Unescape View File

@ -12,6 +12,8 @@
#include "terminal.h" #include "terminal.h"
Window::Window() { Window::Window() {
Gsv::init();
set_title("juCi++"); set_title("juCi++");
set_events(Gdk::POINTER_MOTION_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::SCROLL_MASK|Gdk::LEAVE_NOTIFY_MASK); set_events(Gdk::POINTER_MOTION_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::SCROLL_MASK|Gdk::LEAVE_NOTIFY_MASK);
@ -135,17 +137,43 @@ Window::Window() {
void Window::configure() { void Window::configure() {
Config::get().load(); Config::get().load();
auto screen = Gdk::Screen::get_default(); auto screen = get_screen();
if(css_provider) if(css_provider_theme)
Gtk::StyleContext::remove_provider_for_screen(screen, css_provider); Gtk::StyleContext::remove_provider_for_screen(screen, css_provider_theme);
if(Config::get().window.theme_name.empty()) { if(Config::get().window.theme_name.empty()) {
css_provider=Gtk::CssProvider::create(); css_provider_theme=Gtk::CssProvider::create();
Gtk::Settings::get_default()->property_gtk_application_prefer_dark_theme()=(Config::get().window.theme_variant=="dark"); Gtk::Settings::get_default()->property_gtk_application_prefer_dark_theme()=(Config::get().window.theme_variant=="dark");
} }
else else
css_provider=Gtk::CssProvider::get_named(Config::get().window.theme_name, Config::get().window.theme_variant); css_provider_theme=Gtk::CssProvider::get_named(Config::get().window.theme_name, Config::get().window.theme_variant);
//TODO: add check if theme exists, or else write error to terminal //TODO: add check if theme exists, or else write error to terminal
Gtk::StyleContext::add_provider_for_screen(screen, css_provider, GTK_STYLE_PROVIDER_PRIORITY_SETTINGS); Gtk::StyleContext::add_provider_for_screen(screen, css_provider_theme, GTK_STYLE_PROVIDER_PRIORITY_SETTINGS);
auto style_scheme_manager=Source::StyleSchemeManager::get_default();
if(css_provider_tooltips)
Gtk::StyleContext::remove_provider_for_screen(screen, css_provider_tooltips);
else
css_provider_tooltips=Gtk::CssProvider::create();
Glib::RefPtr<Gsv::Style> style;
if(Config::get().source.style.size()>0) {
auto scheme = style_scheme_manager->get_scheme(Config::get().source.style);
if(scheme)
style = scheme->get_style("def:note");
else {
Terminal::get().print("Error: Could not find gtksourceview style: "+Config::get().source.style+'\n', true);
}
}
auto foreground_value = style && style->property_foreground_set() ? style->property_foreground().get_value() : get_style_context()->get_color().to_string();
auto background_value = style && style->property_background_set() ? style->property_background().get_value() : get_style_context()->get_background_color().to_string();
#if GTK_VERSION_GE(3, 20)
css_provider_tooltips->load_from_data(".juci_tooltip_box {background-color: "+background_value+";}"
".juci_tooltip_text_view text {color: "+foreground_value+";background-color: "+background_value+";}");
#else
css_provider_tooltips->load_from_data(".juci_tooltip_box {background-color: "+background_value+";}"
".juci_tooltip_text_view *:not(:selected) {color: "+foreground_value+";background-color: "+background_value+";}");
#endif
get_style_context()->add_provider_for_screen(screen, css_provider_tooltips, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
Menu::get().set_keys(); Menu::get().set_keys();
Terminal::get().configure(); Terminal::get().configure();
Directories::get().update(); Directories::get().update();

3
src/window.h
Unescape View File

@ -21,7 +21,8 @@ protected:
private: private:
Gtk::AboutDialog about; Gtk::AboutDialog about;
Glib::RefPtr<Gtk::CssProvider> css_provider; Glib::RefPtr<Gtk::CssProvider> css_provider_theme;
Glib::RefPtr<Gtk::CssProvider> css_provider_tooltips;
void configure(); void configure();
void set_menu_actions(); void set_menu_actions();

10
tests/source_test.cc
Unescape View File

@ -41,6 +41,16 @@ int main() {
g_assert(boost::filesystem::remove(source_file)); g_assert(boost::filesystem::remove(source_file));
g_assert(!boost::filesystem::exists(source_file)); g_assert(!boost::filesystem::exists(source_file));
for(int c=0;c<2;++c) {
size_t found=0;
auto style_scheme_manager=Source::StyleSchemeManager::get_default();
for(auto &search_path: style_scheme_manager->get_search_path()) {
if(search_path=="styles") // found added style
++found;
}
g_assert(found==1);
}
// replace_text tests // replace_text tests
{ {
auto buffer=source_view.get_buffer(); auto buffer=source_view.get_buffer();

Write Preview
Loading…
Cancel
Save