1
0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-03 14:34:08 +02:00

Add tooltip for collapsed links when expanding is disabled

Closes 
This commit is contained in:
chylex 2016-05-09 14:44:04 +02:00
parent a230258bec
commit 45a38d9570
5 changed files with 61 additions and 16 deletions

View File

@ -23,8 +23,10 @@ protected override void Dispose(bool disposing) {
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBrowser));
this.trayIcon = new TweetDck.Core.TrayIcon();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout();
//
// trayIcon
@ -51,6 +53,7 @@ private void InitializeComponent() {
#endregion
private TrayIcon trayIcon;
private System.Windows.Forms.ToolTip toolTip;
}
}

View File

@ -9,6 +9,7 @@
using TweetDck.Resources;
using TweetDck.Core.Utils;
using TweetDck.Core.Controls;
using System.Drawing;
namespace TweetDck.Core{
sealed partial class FormBrowser : Form{
@ -213,6 +214,17 @@ public void OnTweetSound(){
}
public void DisplayTooltip(string text){
if (string.IsNullOrEmpty(text)){
toolTip.Hide(this);
}
else{
Point position = PointToClient(Cursor.Position);
position.Offset(20,10);
toolTip.Show(text,this,position);
}
}
public void OnImagePasted(){
browser.ExecuteScriptAsync("TDGF_tryPasteImage",new object[0]);
}

View File

@ -120,6 +120,9 @@
<metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>112, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@ -98,6 +98,12 @@ public void OnUpdateDismissed(string versionTag){
});
}
public void DisplayTooltip(string text){
form.InvokeSafe(() => {
form.DisplayTooltip(text);
});
}
public void TryPasteImage(){
form.InvokeSafe(() => {
if (Clipboard.ContainsImage()){

View File

@ -206,11 +206,10 @@
return _.startsWith(str,search) ? str.substr(search.length) : str;
};
$(document.body).delegate("a[data-full-url]","mouseenter mouseleave",function(e){
if (!$TD.expandLinksOnHover){
return;
}
var prevMouseX = -1, prevMouseY = -1;
var tooltipTimer, tooltipDisplayed;
$(document.body).delegate("a[data-full-url]","mouseenter mouseleave mousemove",function(e){
var me = $(this);
if (e.type === "mouseenter"){
@ -220,19 +219,41 @@
return;
}
var expanded = me.attr("data-full-url");
expanded = cutStart(expanded,"https://");
expanded = cutStart(expanded,"http://");
expanded = cutStart(expanded,"www.");
me.attr("td-prev-text",text);
me.text(expanded);
if ($TD.expandLinksOnHover){
var expanded = me.attr("data-full-url");
expanded = cutStart(expanded,"https://");
expanded = cutStart(expanded,"http://");
expanded = cutStart(expanded,"www.");
me.attr("td-prev-text",text);
me.text(expanded);
}
else{
tooltipTimer = window.setTimeout(function(){
$TD.displayTooltip(me.attr("data-full-url"));
tooltipDisplayed = true;
},400);
}
}
else if (e.type === "mouseleave"){
var prevText = me.attr("td-prev-text");
if (prevText){
me.text(prevText);
if ($TD.expandLinksOnHover){
var prevText = me.attr("td-prev-text");
if (prevText){
me.text(prevText);
}
}
else{
window.clearTimeout(tooltipTimer);
tooltipDisplayed = false;
$TD.displayTooltip(null);
}
}
else if (e.type === "mousemove"){
if (tooltipDisplayed && (prevMouseX != e.clientX || prevMouseY != e.clientY)){
$TD.displayTooltip(me.attr("data-full-url"));
prevMouseX = e.clientX;
prevMouseY = e.clientY;
}
}
});