Skip to content

Commit

Permalink
Blame popup option 2
Browse files Browse the repository at this point in the history
  • Loading branch information
stoivo committed Jun 12, 2017
1 parent 55da2ac commit 5319fcc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Default.sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
{
"keys": ["?"],
"command": "gs_interface_toggle_popup_help",
"args": { "view_name": "blame_view" },
"args": { "view_name": "blame_view", "popup_max_width": 1200},
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.blame_view", "operator": "equal", "operand": true }
Expand Down
4 changes: 1 addition & 3 deletions common/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,7 @@ class GsInterfaceTogglePopupHelpCommand(TextCommand):
Toggle GitSavvy popup help.
"""

def run(self, edit, view_name):
popup_max_width = 600
popup_max_height = 600
def run(self, edit, view_name, popup_max_width = 800, popup_max_height=600):
css = sublime.load_resource("Packages/GitSavvy/popups/style.css")
html = sublime.load_resource("Packages/GitSavvy/popups/" + view_name + ".html").format(css=css, super_key=util.super_key)
self.view.show_popup(html, 0, -1, popup_max_width, popup_max_height)
Expand Down
8 changes: 4 additions & 4 deletions popups/blame_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<h3>Actions</h3>
<ul>
<li><code>
<span class="shortcut-key">Open Commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="shortcut-key">Open Commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Open the commit where the courser is
</code></li>
<li><code>
<span class="shortcut-key">Blame before selected commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="shortcut-key">Blame before selected commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Checkout this file at the commit before the commit where the courser is
</code></li>
<li><code>
Expand All @@ -27,11 +27,11 @@ <h3>Actions</h3>
<span class="shortcut-key">Blame on one newer commit</span>
</code></li>
<li><code>
<span class="shortcut-key">Show file at most recent commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="shortcut-key">Show file at most recent commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Show file at the checkout out commit
</code></li>
<li><code>
<span class="shortcut-key">Show file at this chunk's commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="shortcut-key">Show file at this chunk's commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Show file at the commit where the courser is
</code></li>
</ul>
Expand Down

0 comments on commit 5319fcc

Please sign in to comment.