prevent overflowing in sidebar again

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@177 fe716a7a-6dde-0310-88d9-d003556173a8

2 files changed, 5 insertions, 2 deletions

diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index e5e1742..398dd78 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -102,98 +102,100 @@
    </hbox>
   </groupbox>
 
   <tabbox flex="1" id="fireflix_tabs">
 
    <tabs>
     <tab label="&panel.tabs.search;"/>
     <tab label="&panel.tabs.sets;"/>
     <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
     <tab id="tab_upload" label="&panel.tabs.upload;"/>
    </tabs>
 
    <tabpanels flex="1">
 
     <tabpanel id="tabpanel_search" flex="1">
      <vbox flex="1">
       <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
        <hbox>
 	<label control="search_for" value="&panel.search.search_for.label;"
 	accesskey="s"/>
 	<textbox id="search_for" flex="1"/>
        </hbox>
        <hbox>
         <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
 	tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
 	accesskey="t" />
 	<checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
 	<spacer flex="1"/>
 	<button command="cmd_search"/>
        </hbox>
       </groupbox>
       <tree id="searchresults" rows="2" flex="1"
       onselect="fireflix.foundphotos.on_select()"
       ondblclick="fireflix.foundphotos.on_cmd_open(event)"
       onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
       fireflix.foundphotos.on_cmd_open(event)">
        <treecols>
         <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
        </treecols>
        <treechildren/>
       </tree>
       <groupbox id="searchresult_props" orient="horizontal" hidden="true">
        <vbox width="100" pack="center">
         <hbox pack="center">
          <image id="search_photo"/>
 	</hbox>
        </vbox>
        <vbox flex="1">
-        <label id="searchresult_title"/>
-	<div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+        <label id="searchresult_title" crop="end"/>
+	<hbox flex="1" pack="center">
+	 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+	</hbox>
 	<hbox pack="end">
 	 <button command="cmd_search_open"/>
 	</hbox>
        </vbox>
       </groupbox>
      </vbox>
     </tabpanel>
 
     <tabpanel id="tabpanel_sets" flex="1"
      onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
      document.getElementById('setphotos').focus()">
      <vbox flex="1">
       <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
       flex="1" context="sets_menu"
       >
        <treecols>
 	<treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
 	<splitter class="tree-splitter" />
 	<treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
        </treecols>
        <treechildren/>
       </tree>
       <hbox>
        <button command="cmd_refresh_sets" />
        <button command="cmd_set_props" />
       </hbox>
       <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
       flex="1">
        <treecols>
 	<treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
 	<splitter class="tree-splitter" />
 	<treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
 	<treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
        </treecols>
        <treechildren/>
       </tree>
       <groupbox id="set_photo_props" orient="horizontal">
        <vbox width="100" pack="center">
         <hbox pack="center">
 	 <image id="set_photo" hidden="true"/>
 	</hbox>
        </vbox>
        <spacer flex="1"/>
       </groupbox>
      </vbox>
     </tabpanel>
 
     <tabpanel id="tabpanel_tags">
diff --git a/content/fireflix.js b/content/fireflix.js
index f180379..e144aae 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -733,96 +733,97 @@ var fireflix = {
    var pars = {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
    };
    if(this.search_mine.checked)
     pars.user_id='me';
    if(this.search_tags.checked) {
     pars.tags=this.search_for.value.split(/ +/).join(',');
    }else{
     pars.text=this.search_for.value;
    }
    var _this = this;
    this.fireflix.flickr.api_call( pars,
     function(xr) {
      var x = xr.responseXML;
      var xp = x.evaluate(
       '/rsp/photos/photo', x, null,
       XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
      _this.importXPR(xp);
      _this.tree.ensureRowIsVisible(0);
      _this.on_select();
     }, function(x,s,c,m) {
      _this.fireflix.flickr_failure(x,s,c,m);
     }
    );
   },
   render_description_frame: function(content) {
    if(!content) {
     this.searchresult_description.innerHTML = '';
    }else{
     this.searchresult_description.innerHTML = content?content:'';
     /* of all linking elements flickr only allows a */
     var as = this.searchresult_description.getElementsByTagName('a');
     for(var a=0;a<as.length;++a)
      as.item(a).setAttribute('target','_blank');
    }
   },
   on_select: function() {
    if(this.selection.currentIndex<0) {
     this.searchresult_props.hidden = true;
    }else{
     var p = this.photos[this.selection.currentIndex];
     if(!p) {
      this.searchresult_props.hidden = true;
     }else{
      this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
      this.searchresult_title.value = p.title;
+     this.searchresult_title.tooltipText = p.title;
      this.render_description_frame(null);
      if(p.description==null && p.description==undefined) {
       var pid = p.id;
       var ci = this.selection.currentIndex;
       var _this = this;
       this.fireflix.flickr.api_call(
        {
 	method: 'flickr.photos.getInfo',
 	auth_token: 'default',
 	photo_id: p.id,
 	secret: p.secret
        }, function(xr) {
 	var pp = _this.photos[ci];
 	if(ci==_this.selection.currentIndex && pp.id==pid) {
 	 var n = xp_node('/rsp/photo',xr.responseXML);
 	 pp.fromNode_(n);
 	 _this.render_description_frame(pp.description);
 	}
        }, function(x,s,c,m) {
 	_this.fireflix.flickr_failure(x,s,c,m);
        }
       );
       this.searchresult_props.hidden = false;
      }else{
       this.render_description_frame(p.description);
      }
     }
    }
   },
   on_cmd_open: function(ev) {
    if(this.selection.currentIndex<0)
     return;
    var p = this.photos[this.selection.currentIndex];
    if(!p.id)
     return;
    this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
   }
  },
 
  photo_html: function(p,i,l) {
   // TODO: add alt/title when possible
   var rv = 
    '<a href="'+this.flickr.make_photo_url(p,l)+'">' +
    '<img src="'+this.flickr.make_photo_url(p,i)+'" />'+
    '</a>';
   return rv;
  },
  build_html: function(photos,uti,utl) {